summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/jingle
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/jabber/jingle')
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/ConfigureChecks.cmake5
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cpp2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h2
5 files changed, 5 insertions, 8 deletions
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/ConfigureChecks.cmake b/kopete/protocols/jabber/jingle/libjingle/talk/ConfigureChecks.cmake
index 396efa92..6752f3b3 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/ConfigureChecks.cmake
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/ConfigureChecks.cmake
@@ -25,12 +25,9 @@ endif( )
# speex
if( WITH_SPEEX )
- pkg_search_module( SPEEX speex )
+ pkg_search_module( SPEEX speex>=1.0.5 )
if( SPEEX_FOUND )
set( HAVE_SPEEX 1 CACHE INTERNAL "" FORCE )
- if( NOT SPEEX_INCLUDE_DIRS )
- set( SPEEX_INCLUDE_DIRS "/usr/include/speex" )
- endif( )
else( )
tde_message_fatal( "speex is required, but was not found on your system" )
endif( )
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cpp b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cpp
index 93cc24c3..3295b146 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cpp
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cpp
@@ -1,6 +1,6 @@
#include <portaudio.h>
#include <ortp.h>
-#include <speex.h>
+#include <speex/speex.h>
// Socket stuff
#ifndef _WIN32
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 b3bea30f..63c46fc5 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h
@@ -2,7 +2,7 @@
#define PORTAUDIOMEDIAENGINE_H
#include <portaudio.h>
-#include <speex.h>
+#include <speex/speex.h>
#include <ortp.h>
#include "talk/session/phone/mediaengine.h"
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h
index 6ad1aba9..be8e6a43 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h
@@ -23,7 +23,7 @@
#define MSSPEEXDEC_H
#include <mscodec.h>
-#include <speex.h>
+#include <speex/speex.h>
#if defined(__cplusplus)
extern "C" {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h
index f63edfcd..cd0499eb 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h
@@ -23,7 +23,7 @@
#define MSSPEEXENC_H
#include <mscodec.h>
-#include <speex.h>
+#include <speex/speex.h>
struct _MSSpeexEnc
{