TDE
/
tdenetwork
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdenetwork
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix automake build: jingle support

Browse Source 
(cherry picked from commit 99a94433e4)
v3.5.13-sru
Slávek Banko 12 years ago
parent 9c108ba7b3
commit c45e2db6b3
10 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File

3
kopete/protocols/jabber/jingle/Makefile.am
Unescape View File

@ -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)

6
kopete/protocols/jabber/jingle/configure.in.bot
Unescape View File

@ -5,8 +5,14 @@ if test "$with_jingle" = yes; then
echo iLBC: $ilbc_found
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 ""

15
kopete/protocols/jabber/jingle/configure.in.in
Unescape View File

@ -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] ],

3
kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile.am
Unescape View File

@ -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)/../../..

2
kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile.am
Unescape View File

@ -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

2
kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc
Unescape View File

@ -1,5 +1,5 @@
#include <portaudio.h>
#include <ortp/ortp.h>
#include <ortp.h>
#include <speex.h>
// Socket stuff

2
kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h
Unescape View File

@ -3,7 +3,7 @@
#include <portaudio.h>
#include <speex.h>
#include <ortp/ortp.h>
#include <ortp.h>
#include "talk/session/phone/mediaengine.h"

2
kopete/protocols/jabber/jingle/libjingle/talk/third_party/Makefile.am vendored
Unescape View File

@ -1 +1 @@
SUBDIRS=mediastreamer
SUBDIRS=mediastreamer ortp

6
kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am vendored
Unescape View File

@ -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

18
kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/Makefile.am vendored
Unescape View File

@ -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
Write Preview
Loading…
Cancel
Save