Attachment 1024 Details for Bug 1097 – Patch to build libjingle voice support

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.

[patch] Patch to build libjingle voice support

tdenetwork-jingle.diff (text/plain), 6.74 KB, created by Darrell on 2012-11-24 18:08:33 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Darrell

Created: 2012-11-24 18:08:33 CST

Size: 6.74 KB

patch

obsolete

>diff -urN tdenetwork/kopete/protocols/jabber/jingle/Makefile.am tdenetwork.new/kopete/protocols/jabber/jingle/Makefile.am
>--- tdenetwork/kopete/protocols/jabber/jingle/Makefile.am	2012-09-14 18:01:05.000000000 -0500
>+++ tdenetwork.new/kopete/protocols/jabber/jingle/Makefile.am	2012-11-24 17:19:44.000000000 -0600
>@@ -25,4 +25,4 @@
> 	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)
>+	$(EXPAT_LIBS) -lpthread $(ILBC_LIBS) $(SPEEX_LIBS) $(GLIB_LIBS) $(ALSA_LIBS)
>diff -urN tdenetwork/kopete/protocols/jabber/jingle/configure.in.bot tdenetwork.new/kopete/protocols/jabber/jingle/configure.in.bot
>--- tdenetwork/kopete/protocols/jabber/jingle/configure.in.bot	2012-11-23 22:01:43.000000000 -0600
>+++ tdenetwork.new/kopete/protocols/jabber/jingle/configure.in.bot	2012-11-24 16:59:38.000000000 -0600
>@@ -6,7 +6,13 @@
> 	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 -urN tdenetwork/kopete/protocols/jabber/jingle/configure.in.in tdenetwork.new/kopete/protocols/jabber/jingle/configure.in.in
>--- tdenetwork/kopete/protocols/jabber/jingle/configure.in.in	2012-09-14 18:01:05.000000000 -0500
>+++ tdenetwork.new/kopete/protocols/jabber/jingle/configure.in.in	2012-11-24 16:57:50.000000000 -0600
>@@ -28,13 +28,14 @@
> 	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 -urN tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile.am tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile.am
>--- tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile.am	2012-09-14 18:01:05.000000000 -0500
>+++ tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile.am	2012-11-24 17:19:27.000000000 -0600
>@@ -11,6 +11,6 @@
> 	       $(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 
>+	       $(EXPAT_LIBS) -lpthread $(ILBC_LIBS) $(SPEEX_LIBS) $(GLIB_LIBS) -lasound 
> AM_CPPFLAGS  = -DPOSIX
> DEFAULT_INCLUDES = -I$(srcdir)/../../..
>\ No newline at end of file
>diff -urN tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile.am tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile.am
>--- tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile.am	2012-09-14 18:01:05.000000000 -0500
>+++ tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile.am	2012-11-24 16:48:54.000000000 -0600
>@@ -14,5 +14,5 @@
>                                     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 -urN tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc
>--- tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc	2012-09-14 18:01:05.000000000 -0500
>+++ tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc	2012-11-24 16:49:31.000000000 -0600
>@@ -1,5 +1,5 @@
> #include <portaudio.h>
>-#include <ortp/ortp.h>
>+#include <ortp.h>
> #include <speex.h>
> 
> // Socket stuff
>diff -urN tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h
>--- tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h	2012-10-21 13:04:54.000000000 -0500
>+++ tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h	2012-11-24 16:49:40.000000000 -0600
>@@ -3,7 +3,7 @@
> 
> #include <portaudio.h>
> #include <speex.h>
>-#include <ortp/ortp.h>
>+#include <ortp.h>
> 
> #include "talk/session/phone/mediaengine.h"
> 
>diff -urN tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am
>--- tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am	2012-09-14 18:01:05.000000000 -0500
>+++ tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am	2012-11-24 17:19:06.000000000 -0600
>@@ -85,8 +85,8 @@
> 			      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

Actions: View | Diff

Attachments on bug 1097: 917 | 918 | 1024 | 1030 | 1032 | 2346