kopete/trunk/kopete-mediastreamer-4.3.patch

   1 diff --git a/CMakeLists.txt b/CMakeLists.txt
   2 index 55556be4a..8e63c2cee 100644
   3 --- a/CMakeLists.txt
   4 +++ b/CMakeLists.txt
   5 @@ -92,8 +92,8 @@ set_package_properties(Libgadu PROPERTIES DESCRIPTION "A library providing suppo
   6  find_package(LibMeanwhile QUIET)
   7  set_package_properties(LibMeanwhile PROPERTIES DESCRIPTION "A library for protocol support for connection to sametime servers" URL "http://meanwhile.sourceforge.net/" TYPE OPTIONAL PURPOSE "Required for the meanwhile protocol")
   8
   9 -find_package(LiboRTP QUIET)
  10 -set_package_properties(LiboRTP PROPERTIES DESCRIPTION "oRTP provides an API to send rtp packets" URL "http://www.linphone.org/index.php/eng/code_review/ortp/" TYPE OPTIONAL PURPOSE "Required for the Jabber protocol with libjingle support")
  11 +find_package(ortp QUIET)
  12 +set_package_properties(ortp PROPERTIES DESCRIPTION "oRTP provides an API to send rtp packets" URL "http://www.linphone.org/index.php/eng/code_review/ortp/" TYPE OPTIONAL PURPOSE "Required for the Jabber protocol with libjingle support")
  13
  14  find_package(LibOTR QUIET)
  15  set_package_properties(LibOTR PROPERTIES DESCRIPTION "Library to encrypt messages with off-the-record encryption" URL "http://www.cypherpunks.ca/otr/" TYPE OPTIONAL PURPOSE "Required for the OTR plugin")
  16 @@ -107,8 +107,8 @@ set_package_properties(LibXml2 PROPERTIES DESCRIPTION "Libraries used to develop
  17  find_package(LibXslt QUIET)
  18  set_package_properties(LibXslt PROPERTIES DESCRIPTION "A library to transform XML files into other XML files" URL "http://www.xmlsoft.org/XSLT/" TYPE OPTIONAL PURPOSE "Required for the Webpresence plugin")
  19
  20 -find_package(Mediastreamer QUIET)
  21 -set_package_properties(Mediastreamer PROPERTIES DESCRIPTION "A streaming enginer specialized for voice/video telephony applications" URL "http://www.linphone.org/index.php/eng/code_review/mediastreamer2/" TYPE OPTIONAL PURPOSE "Required for the Jabber protocol with libjingle support")
  22 +find_package(Mediastreamer2 QUIET)
  23 +set_package_properties(Mediastreamer2 PROPERTIES DESCRIPTION "A streaming enginer specialized for voice/video telephony applications" URL "http://www.linphone.org/index.php/eng/code_review/mediastreamer2/" TYPE OPTIONAL PURPOSE "Required for the Jabber protocol with libjingle support")
  24
  25  find_package(OpenSSL QUIET)
  26  set_package_properties(OpenSSL PROPERTIES DESCRIPTION "OpenSSL implementation of SSL" URL "https://www.openssl.org/" TYPE OPTIONAL PURPOSE "Required for the Jabber protocol with libjingle support")
  27 diff --git a/protocols/CMakeLists.txt b/protocols/CMakeLists.txt
  28 index 89d36a4e4..5f13ff9d9 100644
  29 --- a/protocols/CMakeLists.txt
  30 +++ b/protocols/CMakeLists.txt
  31 @@ -22,7 +22,7 @@ option(WITH_skype "Enable Kopete Skype protocol" ON)
  32  set(BUILD_JINGLE FALSE)
  33
  34  if(OPENSSL_FOUND OR WIN32)
  35 -  if(EXPAT_FOUND AND LIBORTP_FOUND AND SRTP_FOUND AND JSONCPP_FOUND AND MEDIASTREAMER_FOUND AND WITH_libjingle)
  36 +  if(EXPAT_FOUND AND ORTP_FOUND AND SRTP_FOUND AND JSONCPP_FOUND AND MEDIASTREAMER2_FOUND AND WITH_libjingle)
  37      message(STATUS "Building jabber libjingle support")
  38      set(BUILD_LIBJINGLE TRUE)
  39    else()
  40 diff --git a/protocols/jabber/libjingle/CMakeLists.txt b/protocols/jabber/libjingle/CMakeLists.txt
  41 index af7c1c3af..de7596615 100644
  42 --- a/protocols/jabber/libjingle/CMakeLists.txt
  43 +++ b/protocols/jabber/libjingle/CMakeLists.txt
  44 @@ -286,8 +286,8 @@ set ( call_LIBS
  45         ${SRTP_LIBRARY}
  46         ${JSONCPP_LIBRARY}
  47         EXPAT::EXPAT
  48 -       ${MEDIASTREAMER_LIBRARIES}
  49 -       ${LIBORTP_LIBRARY}
  50 +       ${MEDIASTREAMER2_LIBRARIES}
  51 +       ${ORTP_LIBRARIES}
  52         ${CMAKE_THREAD_LIBS_INIT}
  53         ${CMAKE_DL_LIBS}
  54  )
  55 diff --git a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
  56 index bd11027e0..6f9e05a0a 100644
  57 --- a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
  58 +++ b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
  59 @@ -34,11 +34,9 @@
  60  #ifdef HAVE_LINPHONE
  61
  62  // LinphoneMediaEngine is a Linphone implementation of MediaEngine
  63 -extern "C" {
  64  #include <mediastreamer2/mediastream.h>
  65  #include <mediastreamer2/mssndcard.h>
  66  #include <mediastreamer2/msfilter.h>
  67 -}
  68
  69  #include "talk/session/phone/linphonemediaengine.h"
  70
  71 diff --git a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.h b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.h
  72 index 6105ab8cb..f5b5c3b14 100644
  73 --- a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.h
  74 +++ b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.h
  75 @@ -35,9 +35,7 @@
  76  #include <string>
  77  #include <vector>
  78
  79 -extern "C" {
  80  #include <mediastreamer2/mediastream.h>
  81 -}
  82
  83  #include "talk/base/scoped_ptr.h"
  84  #include "talk/session/phone/codec.h"