Attachment 2170 Details for Bug 12648 – kdenetwork-3.5.7-alt-kopete-jingle.patch

[patch] kdenetwork-3.5.7-alt-kopete-jingle.patch

kdenetwork-3.5.7-alt-kopete-jingle.patch (text/plain), 2.95 KB, created by Valery Inozemtsev on 2007-08-29 14:44:17 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: Valery Inozemtsev

Created: 2007-08-29 14:44:17 MSD

Size: 2.95 KB

patch

obsolete

>BuildRequires: glib2-devel libortp-devel >= 0.13.1 libilbc-devel
>
>--- kdenetwork-3.5.7/kopete/protocols/jabber/Makefile.am.jingle	2007-08-09 19:45:17 +0400
>+++ kdenetwork-3.5.7/kopete/protocols/jabber/Makefile.am	2007-08-09 19:44:12 +0400
>@@ -1,6 +1,6 @@
> if include_jingle
> JINGLE=jingle
>-JINGLE_LIBS=jingle/libkopetejabberjingle.la
>+JINGLE_LIBS=jingle/libkopetejabberjingle.la -lgthread-2.0
> JINGLE_INCLUDES=-I$(srcdir)/jingle -I$(top_builddir)/kopete/protocols/jabber/jingle
> endif
> 
>--- kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h.jingle	2007-08-09 19:36:27 +0400
>+++ kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h	2007-08-09 19:36:40 +0400
>@@ -23,7 +23,7 @@
> #define MSSPEEXDEC_H
> 
> #include <mscodec.h>
>-#include <speex.h>
>+#include <speex/speex.h>
> 
> struct _MSSpeexDec
> {
>--- kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h.jingle	2007-08-09 19:39:12 +0400
>+++ kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h	2007-08-09 19:39:26 +0400
>@@ -23,7 +23,7 @@
> #define MSSPEEXENC_H
> 
> #include <mscodec.h>
>-#include <speex.h>
>+#include <speex/speex.h>
> 
> struct _MSSpeexEnc
> {
>--- kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc.jingle	2006-10-01 21:26:44 +0400
>+++ kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc	2007-08-29 14:35:51 +0400
>@@ -139,7 +139,7 @@ bool LinphoneMediaEngine::Init() {
>  
> #ifdef HAVE_SPEEX
>   ms_speex_codec_init();
>-  rtp_profile_set_payload(&av_profile, 110, &speex_wb);
>+  rtp_profile_set_payload(&av_profile, 110, &payload_type_speex_wb);
>   codecs_.push_back(Codec(110, "speex", 8));
> #endif
> 
>@@ -149,7 +149,7 @@ bool LinphoneMediaEngine::Init() {
>   codecs_.push_back(Codec(102, "iLBC", 4));
> #endif
> 
>-  rtp_profile_set_payload(&av_profile, 0, &pcmu8000);
>+  rtp_profile_set_payload(&av_profile, 0, &payload_type_pcmu8000);
>   codecs_.push_back(Codec(0, "PCMU", 2));
>   
> return true;
>--- kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc.jingle	2006-10-01 21:26:44 +0400
>+++ kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc	2007-08-29 14:37:25 +0400
>@@ -1,6 +1,6 @@
> #include <portaudio.h>
> #include <ortp/ortp.h>
>-#include <speex.h>
>+#include <speex/speex.h>
> 
> // Socket stuff
> #ifndef _WIN32
>--- kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h.jingle	2006-10-01 21:26:44 +0400
>+++ kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h	2007-08-29 14:37:45 +0400
>@@ -2,7 +2,7 @@
> #define PORTAUDIOMEDIAENGINE_H
> 
> #include <portaudio.h>
>-#include <speex.h>
>+#include <speex/speex.h>
> #include <ortp/ortp.h>
> 
> #include "talk/session/phone/mediaengine.h"

Actions: View | Diff

Attachments on bug 12648: 2170