diff options
10 files changed, 43 insertions, 16 deletions
diff --git a/kopete/protocols/jabber/jingle/Makefile.am b/kopete/protocols/jabber/jingle/Makefile.am index 553be0d7..6fd310ad 100644 --- a/kopete/protocols/jabber/jingle/Makefile.am +++ b/kopete/protocols/jabber/jingle/Makefile.am @@ -25,4 +25,5 @@ libkopetejabberjingle_la_LIBADD = libjingle/talk/session/phone/libcricketsession libjingle/talk/xmllite/libcricketxmllite.la \ libjingle/talk/base/libcricketbase.la \ libjingle/talk/third_party/mediastreamer/libmediastreamer.la \ - $(EXPAT_LIBS) $(ORTP_LIBS) -lpthread $(ILBC_LIBS) $(SPEEX_LIBS) $(GLIB_LIBS) $(ALSA_LIBS) + libjingle/talk/third_party/ortp/libortp.la \ + $(EXPAT_LIBS) -lpthread $(ILBC_LIBS) $(SPEEX_LIBS) $(GLIB_LIBS) $(ALSA_LIBS) diff --git a/kopete/protocols/jabber/jingle/configure.in.bot b/kopete/protocols/jabber/jingle/configure.in.bot index 153f0596..9c37e2b8 100644 --- a/kopete/protocols/jabber/jingle/configure.in.bot +++ b/kopete/protocols/jabber/jingle/configure.in.bot @@ -6,7 +6,13 @@ if test "$with_jingle" = yes; then echo MULAW: yes else echo "" + echo Supported Jabber Jingle voice Codecs for Kopete: + echo Speex: $speex_found + echo iLBC: $ilbc_found + echo MULAW: yes + echo "" echo "You have disabled Jabber Jingle voice support or you are missing required libraries required to compile it." + echo "The configure option --enable-jingle must be explicitly declared to build Jabber Jingle voice support." echo "Jingle is a new Jabber standard that define a signaling protocol via XMPP for peer-to-peer applications." echo "Jingle audio is compatible with the Google Talk voice service." echo "" diff --git a/kopete/protocols/jabber/jingle/configure.in.in b/kopete/protocols/jabber/jingle/configure.in.in index ee4db3fa..a03ea347 100644 --- a/kopete/protocols/jabber/jingle/configure.in.in +++ b/kopete/protocols/jabber/jingle/configure.in.in @@ -28,13 +28,14 @@ if test x$have_glib = xno; then with_jingle=no fi -PKG_CHECK_MODULES(ORTP, ortp, enable_ortp=yes, enable_ortp=no) -if test x$enable_ortp = xno ; then - with_jingle=no - AC_MSG_WARN([oRTP is required to build Jabber Jingle voice support. You can get it from http://www.linphone.org/ortp/]) -fi -AC_SUBST(ORTP_CFLAGS) -AC_SUBST(ORTP_LIBS) +# Do not use an external version of ortp. Only use the internal version supplied here. +#PKG_CHECK_MODULES(ORTP, ortp, enable_ortp=yes, enable_ortp=no) +#if test x$enable_ortp = xno ; then +# with_jingle=no +# AC_MSG_WARN([oRTP is required to build Jabber Jingle voice support. You can get it from http://www.linphone.org/ortp/]) +#fi +#AC_SUBST(ORTP_CFLAGS) +#AC_SUBST(ORTP_LIBS) AC_ARG_WITH( speex, [ --with-speex Set prefix where speex lib can be found (ex:/usr, /usr/local) [default=/usr] ], diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile.am b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile.am index 81cf9345..64e09526 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile.am +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile.am @@ -11,6 +11,7 @@ call_LDADD = \ $(srcdir)/../../../talk/xmllite/libcricketxmllite.la \ $(srcdir)/../../../talk/base/libcricketbase.la \ $(srcdir)/../../../talk/third_party/mediastreamer/libmediastreamer.la \ - $(EXPAT_LIBS) $(ORTP_LIBS) -lpthread $(ILBC_LIBS) $(SPEEX_LIBS) $(GLIB_LIBS) -lasound + $(srcdir)/../../../talk/third_party/ortp/libortp.la \ + $(EXPAT_LIBS) -lpthread $(ILBC_LIBS) $(SPEEX_LIBS) $(GLIB_LIBS) -lasound AM_CPPFLAGS = -DPOSIX DEFAULT_INCLUDES = -I$(srcdir)/../../..
\ No newline at end of file diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile.am b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile.am index b2acbf81..aef28293 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile.am +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile.am @@ -14,5 +14,5 @@ noinst_HEADERS = audiomonitor.h \ call.h \ mediachannel.h -AM_CPPFLAGS = -DPOSIX $(ORTP_CFLAGS) $(ILBC_CFLAGS) -I$(srcdir)/../../../talk/third_party/mediastreamer -I$(srcdir)/../../.. $(GLIB_CFLAGS) $(SPEEX_CFLAGS) +AM_CPPFLAGS = -DPOSIX -I$(srcdir)/../../../talk/third_party/ortp $(ILBC_CFLAGS) -I$(srcdir)/../../../talk/third_party/mediastreamer -I$(srcdir)/../../.. $(GLIB_CFLAGS) $(SPEEX_CFLAGS) noinst_LTLIBRARIES = libcricketsessionphone.la diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc index b65c9a20..93cc24c3 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc @@ -1,5 +1,5 @@ #include <portaudio.h> -#include <ortp/ortp.h> +#include <ortp.h> #include <speex.h> // Socket stuff diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h index 95c39a1a..b3bea30f 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h @@ -3,7 +3,7 @@ #include <portaudio.h> #include <speex.h> -#include <ortp/ortp.h> +#include <ortp.h> #include "talk/session/phone/mediaengine.h" diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/Makefile.am b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/Makefile.am index 3186245a..ba6b6440 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/Makefile.am +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/Makefile.am @@ -1 +1 @@ -SUBDIRS=mediastreamer +SUBDIRS=mediastreamer ortp diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am index 268a52fe..a81a4f8b 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am @@ -85,8 +85,8 @@ noinst_HEADERS = affine.h \ sndcard.h -libmediastreamer_la_LIBADD= $(GLIB_LIBS) $(ORTP_LIBS) $(SPEEX_LIBS) +libmediastreamer_la_LIBADD= $(GLIB_LIBS) $(SPEEX_LIBS) -AM_CFLAGS=$(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"MediaStreamer\" $(ORTP_CFLAGS) $(IPV6_CFLAGS) $(ILBC_CFLAGS) $(SPEEX_CFLAGS) +AM_CFLAGS=$(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"MediaStreamer\" -I$(srcdir)/../../../talk/third_party/ortp $(IPV6_CFLAGS) $(ILBC_CFLAGS) $(SPEEX_CFLAGS) -INCLUDES= -I$(srcdir)/../../.. $(ORTP_CFLAGS) +INCLUDES= -I$(srcdir)/../../.. -I$(srcdir)/../../../talk/third_party/ortp diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/Makefile.am b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/Makefile.am new file mode 100644 index 00000000..6a804b7f --- /dev/null +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/Makefile.am @@ -0,0 +1,18 @@ +noinst_LTLIBRARIES = libortp.la + +noinst_HEADERS = \ + export.h jitterctl.h ortp-config.h ortp.h payloadtype.h \ + port_fct.h rtcp.h rtp.h rtpmod.h rtpport.h rtpsession.h \ + rtpsignaltable.h rtptimer.h scheduler.h sessionset.h \ + str_utils.h telephonyevents.h utils.h + +libortp_la_SOURCES= \ + port_fct.c rtpmod.c rtpparse.c rtpsession.c jitterctl.c \ + rtpsignaltable.c rtptimer.c posixtimer.c ortp.c scheduler.c \ + avprofile.c sessionset.c telephonyevents.c payloadtype.c rtcp.c \ + utils.c rtcpparse.c str_utils.c + +libortp_la_LIBADD= $(GLIB_LIBS) + +AM_CFLAGS=-D_ORTP_SOURCE -DG_LOG_DOMAIN=\"oRTP\" $(GLIB_CFLAGS) +CFLAGS+=-std=gnu89 |