Attachment #1024 for bug #1097

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1097
Collapse All | Expand All

Lines 25-28 Link Here

(-)tdenetwork/kopete/protocols/jabber/jingle/Makefile.am (-1 / +1 lines)
25	libjingle/talk/xmllite/libcricketxmllite.la \	25	libjingle/talk/xmllite/libcricketxmllite.la \
26	libjingle/talk/base/libcricketbase.la \	26	libjingle/talk/base/libcricketbase.la \
27	libjingle/talk/third_party/mediastreamer/libmediastreamer.la \	27	libjingle/talk/third_party/mediastreamer/libmediastreamer.la \
28	$(EXPAT_LIBS) $(ORTP_LIBS) -lpthread $(ILBC_LIBS) $(SPEEX_LIBS) $(GLIB_LIBS) $(ALSA_LIBS)	28	$(EXPAT_LIBS) -lpthread $(ILBC_LIBS) $(SPEEX_LIBS) $(GLIB_LIBS) $(ALSA_LIBS)

Lines 6-12 Link Here

(-)tdenetwork/kopete/protocols/jabber/jingle/configure.in.bot (+6 lines)
6	echo MULAW: yes	6	echo MULAW: yes
7	else	7	else
8	echo ""	8	echo ""
		9	echo Supported Jabber Jingle voice Codecs for Kopete:
		10	echo Speex: $speex_found
		11	echo iLBC: $ilbc_found
		12	echo MULAW: yes
		13	echo ""
9	echo "You have disabled Jabber Jingle voice support or you are missing required libraries required to compile it."	14	echo "You have disabled Jabber Jingle voice support or you are missing required libraries required to compile it."
		15	echo "The configure option --enable-jingle must be explicitly declared to build Jabber Jingle voice support."
10	echo "Jingle is a new Jabber standard that define a signaling protocol via XMPP for peer-to-peer applications."	16	echo "Jingle is a new Jabber standard that define a signaling protocol via XMPP for peer-to-peer applications."
11	echo "Jingle audio is compatible with the Google Talk voice service."	17	echo "Jingle audio is compatible with the Google Talk voice service."
12	echo ""	18	echo ""




	with_jingle=no
fi

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

Lines 11-16 Link Here

(-)tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile.am (-1 / +1 lines)
11	$(srcdir)/../../../talk/xmllite/libcricketxmllite.la \	11	$(srcdir)/../../../talk/xmllite/libcricketxmllite.la \
12	$(srcdir)/../../../talk/base/libcricketbase.la \	12	$(srcdir)/../../../talk/base/libcricketbase.la \
13	$(srcdir)/../../../talk/third_party/mediastreamer/libmediastreamer.la \	13	$(srcdir)/../../../talk/third_party/mediastreamer/libmediastreamer.la \
14	$(EXPAT_LIBS) $(ORTP_LIBS) -lpthread $(ILBC_LIBS) $(SPEEX_LIBS) $(GLIB_LIBS) -lasound	14	$(EXPAT_LIBS) -lpthread $(ILBC_LIBS) $(SPEEX_LIBS) $(GLIB_LIBS) -lasound
15	AM_CPPFLAGS = -DPOSIX	15	AM_CPPFLAGS = -DPOSIX
16	DEFAULT_INCLUDES = -I$(srcdir)/../../..	16	DEFAULT_INCLUDES = -I$(srcdir)/../../..

Lines 14-18 Link Here

(-)tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile.am (-1 / +1 lines)
14	call.h \	14	call.h \
15	mediachannel.h	15	mediachannel.h
16		16
17	AM_CPPFLAGS = -DPOSIX $(ORTP_CFLAGS) $(ILBC_CFLAGS) -I$(srcdir)/../../../talk/third_party/mediastreamer -I$(srcdir)/../../.. $(GLIB_CFLAGS) $(SPEEX_CFLAGS)	17	AM_CPPFLAGS = -DPOSIX -I$(srcdir)/../../../talk/third_party/ortp $(ILBC_CFLAGS) -I$(srcdir)/../../../talk/third_party/mediastreamer -I$(srcdir)/../../.. $(GLIB_CFLAGS) $(SPEEX_CFLAGS)
18	noinst_LTLIBRARIES = libcricketsessionphone.la	18	noinst_LTLIBRARIES = libcricketsessionphone.la

Lines 1-5 Link Here

(-)tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc (-1 / +1 lines)
1	#include <portaudio.h>	1	#include <portaudio.h>
2	#include <ortp/ortp.h>	2	#include <ortp.h>
3	#include <speex.h>	3	#include <speex.h>
4		4
5	// Socket stuff	5	// Socket stuff

Lines 3-9 Link Here

(-)tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h (-1 / +1 lines)
3		3
4	#include <portaudio.h>	4	#include <portaudio.h>
5	#include <speex.h>	5	#include <speex.h>
6	#include <ortp/ortp.h>	6	#include <ortp.h>
7		7
8	#include "talk/session/phone/mediaengine.h"	8	#include "talk/session/phone/mediaengine.h"
9		9

Lines 85-92 Link Here

(-)tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am (-3 / +3 lines)
85	sndcard.h	85	sndcard.h
86		86
87		87
88	libmediastreamer_la_LIBADD= $(GLIB_LIBS) $(ORTP_LIBS) $(SPEEX_LIBS)	88	libmediastreamer_la_LIBADD= $(GLIB_LIBS) $(SPEEX_LIBS)
89		89
90	AM_CFLAGS=$(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"MediaStreamer\" $(ORTP_CFLAGS) $(IPV6_CFLAGS) $(ILBC_CFLAGS) $(SPEEX_CFLAGS)	90	AM_CFLAGS=$(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"MediaStreamer\" -I$(srcdir)/../../../talk/third_party/ortp $(IPV6_CFLAGS) $(ILBC_CFLAGS) $(SPEEX_CFLAGS)
91		91
92	INCLUDES= -I$(srcdir)/../../.. $(ORTP_CFLAGS)	92	INCLUDES= -I$(srcdir)/../../.. -I$(srcdir)/../../../talk/third_party/ortp

Return to bug 1097

Lines 28-40 Link Here

(-)tdenetwork/kopete/protocols/jabber/jingle/configure.in.in (-7 / +8 lines)
28	with_jingle=no	28	with_jingle=no
29	fi	29	fi
30		30
31	PKG_CHECK_MODULES(ORTP, ortp, enable_ortp=yes, enable_ortp=no)	31	# Do not use an external version of ortp. Only use the internal version supplied here.
32	if test x$enable_ortp = xno ; then	32	#PKG_CHECK_MODULES(ORTP, ortp, enable_ortp=yes, enable_ortp=no)
33	with_jingle=no	33	#if test x$enable_ortp = xno ; then
34	AC_MSG_WARN([oRTP is required to build Jabber Jingle voice support. You can get it from http://www.linphone.org/ortp/])	34	# with_jingle=no
35	fi	35	# AC_MSG_WARN([oRTP is required to build Jabber Jingle voice support. You can get it from http://www.linphone.org/ortp/])
36	AC_SUBST(ORTP_CFLAGS)	36	#fi
37	AC_SUBST(ORTP_LIBS)	37	#AC_SUBST(ORTP_CFLAGS)
		38	#AC_SUBST(ORTP_LIBS)
38		39
39	AC_ARG_WITH( speex,	40	AC_ARG_WITH( speex,
40	[ --with-speex Set prefix where speex lib can be found (ex:/usr, /usr/local) [default=/usr] ],	41	[ --with-speex Set prefix where speex lib can be found (ex:/usr, /usr/local) [default=/usr] ],