Date: Thursday, April 20, 2017 @ 08:51:10
  Author: arojas
Revision: 293462

archrelease: copy trunk to kde-unstable-i686, kde-unstable-x86_64

Added:
  kdenetwork-kopete/repos/kde-unstable-i686/
  kdenetwork-kopete/repos/kde-unstable-i686/PKGBUILD
    (from rev 293461, kdenetwork-kopete/trunk/PKGBUILD)
  kdenetwork-kopete/repos/kde-unstable-i686/kopete-mediastreamer2.14.patch
    (from rev 293461, kdenetwork-kopete/trunk/kopete-mediastreamer2.14.patch)
  kdenetwork-kopete/repos/kde-unstable-i686/kopete-pthread-link.patch
    (from rev 293461, kdenetwork-kopete/trunk/kopete-pthread-link.patch)
  kdenetwork-kopete/repos/kde-unstable-x86_64/PKGBUILD
    (from rev 293461, kdenetwork-kopete/trunk/PKGBUILD)
  kdenetwork-kopete/repos/kde-unstable-x86_64/kopete-mediastreamer2.14.patch
    (from rev 293461, kdenetwork-kopete/trunk/kopete-mediastreamer2.14.patch)
  kdenetwork-kopete/repos/kde-unstable-x86_64/kopete-pthread-link.patch
    (from rev 293461, kdenetwork-kopete/trunk/kopete-pthread-link.patch)
Deleted:
  kdenetwork-kopete/repos/kde-unstable-x86_64/PKGBUILD
  kdenetwork-kopete/repos/kde-unstable-x86_64/kopete-mediastreamer2.14.patch
  kdenetwork-kopete/repos/kde-unstable-x86_64/kopete-pthread-link.patch

----------------------------------------------------+
 /PKGBUILD                                          |   52 +++++++++++
 /kopete-mediastreamer2.14.patch                    |   83 +++++++++++++++++++
 /kopete-pthread-link.patch                         |   12 ++
 kde-unstable-i686/PKGBUILD                         |   52 +++++++++++
 kde-unstable-i686/kopete-mediastreamer2.14.patch   |   83 +++++++++++++++++++
 kde-unstable-i686/kopete-pthread-link.patch        |   12 ++
 kde-unstable-x86_64/PKGBUILD                       |   52 -----------
 kde-unstable-x86_64/kopete-mediastreamer2.14.patch |   83 -------------------
 kde-unstable-x86_64/kopete-pthread-link.patch      |   12 --
 9 files changed, 294 insertions(+), 147 deletions(-)

Copied: kdenetwork-kopete/repos/kde-unstable-i686/PKGBUILD (from rev 293461, 
kdenetwork-kopete/trunk/PKGBUILD)
===================================================================
--- kde-unstable-i686/PKGBUILD                          (rev 0)
+++ kde-unstable-i686/PKGBUILD  2017-04-20 08:51:10 UTC (rev 293462)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Maintainer: Antonio Rojas <aro...@archlinux.org>
+# Contributor: Andrea Scarpino <and...@archlinux.org>
+
+pkgname=kdenetwork-kopete
+pkgver=17.04.0
+pkgrel=1
+pkgdesc='Instant Messenger'
+url='https://kde.org/applications/internet/kopete/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde-applications' 'kdenetwork')
+depends=('kdebase-runtime' 'libotr' 'qimageblitz' 'kdepimlibs4' 'qca-qt4')
+makedepends=('cmake' 'automoc4' 'boost' 'mediastreamer' 'libgadu' 'jsoncpp')
+optdepends=('mediastreamer: jingle support' 'libgadu: Gadu-Gadu protocol')
+source=("https://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz"{,.sig}
 
+        kopete-mediastreamer2.14.patch kopete-pthread-link.patch)
+sha256sums=('50dab3e927a992bb30a801edb1dab50526ab0f04744b558be15a17b94f2cb3f1'
+            'SKIP'
+            'c34a268aaa058e563174581dbe37c15fed91e82326ec704d2a872463139865e0'
+            'a7ebdd8dd4336b7ec085ef254bf18040f473b73379a8cd84569b28441a6c71df')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid 
<aa...@kde.org>
+
+prepare() {
+  mkdir -p build
+
+# Fix build with mediastreamer 2.14
+  cd kopete-$pkgver
+  patch -p1 -i ../kopete-mediastreamer2.14.patch
+# Fix linking to pthread in libjingle-call
+  patch -p1 -i ../kopete-pthread-link.patch
+}
+
+build() {
+  cd build
+  cmake ../kopete-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DWITH_Libmsn=OFF \
+    -DOPENSSL_INCLUDE_DIR=/usr/include/openssl-1.0 \
+    -DOPENSSL_SSL_LIBRARY=/usr/lib/openssl-1.0/libssl.so \
+    -DOPENSSL_CRYPTO_LIBRARY=/usr/lib/openssl-1.0/libcrypto.so
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: 
kdenetwork-kopete/repos/kde-unstable-i686/kopete-mediastreamer2.14.patch (from 
rev 293461, kdenetwork-kopete/trunk/kopete-mediastreamer2.14.patch)
===================================================================
--- kde-unstable-i686/kopete-mediastreamer2.14.patch                            
(rev 0)
+++ kde-unstable-i686/kopete-mediastreamer2.14.patch    2017-04-20 08:51:10 UTC 
(rev 293462)
@@ -0,0 +1,83 @@
+diff --git a/cmake/modules/FindMediastreamer.cmake 
b/cmake/modules/FindMediastreamer.cmake
+index 47fe5c3..31802f0 100644
+--- a/cmake/modules/FindMediastreamer.cmake
++++ b/cmake/modules/FindMediastreamer.cmake
+@@ -24,12 +24,19 @@ IF (MEDIASTREAMER_FOUND)
+       IF (MEDIASTREAMER_VERSION VERSION_LESS 2.9)
+           SET(MEDIASTREAMER_LESS_2_9 TRUE)
+           SET(MEDIASTREAMER_LESS_2_11 TRUE)
++          SET(MEDIASTREAMER_LESS_2_14 TRUE)
+       ELSEIF (MEDIASTREAMER_VERSION VERSION_LESS 2.11)
+           SET(MEDIASTREAMER_LESS_2_9 FALSE)
+           SET(MEDIASTREAMER_LESS_2_11 TRUE)
++          SET(MEDIASTREAMER_LESS_2_14 TRUE)
++      ELSEIF (MEDIASTREAMER_VERSION VERSION_LESS 2.14)
++          SET(MEDIASTREAMER_LESS_2_9 FALSE)
++          SET(MEDIASTREAMER_LESS_2_11 FALSE)
++          SET(MEDIASTREAMER_LESS_2_14 TRUE)
+       ELSE (MEDIASTREAMER_VERSION VERSION_LESS 2.9)
+           SET(MEDIASTREAMER_LESS_2_9 FALSE)
+           SET(MEDIASTREAMER_LESS_2_11 FALSE)
++          SET(MEDIASTREAMER_LESS_2_14 FALSE)
+       ENDIF (MEDIASTREAMER_VERSION VERSION_LESS 2.9)
+   ENDIF (NOT MEDIASTREAMER_FIND_QUIETLY)
+ ELSE (MEDIASTREAMER_FOUND)
+diff --git 
a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc 
b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
+index bd3de2b..9379226 100644
+--- a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
++++ b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
+@@ -151,15 +151,25 @@ 
LinphoneVoiceChannel::LinphoneVoiceChannel(LinphoneMediaEngine*eng)
+   playport2 = PORT_UNUSED;
+ 
+ #ifdef _DEBUG
++#ifdef MEDIASTREAMER_LESS_2_14
+   
ortp_set_log_level_mask(ORTP_DEBUG|ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
+ #else
++  ortp_set_log_level_mask(NULL, 
ORTP_DEBUG|ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
++#endif
++#else
++#ifdef MEDIASTREAMER_LESS_2_14
+   ortp_set_log_level_mask(ORTP_FATAL);
++#else
++  ortp_set_log_level_mask(NULL, ORTP_FATAL);
+ #endif
+-
++#endif
++  
+ #ifdef MEDIASTREAMER_LESS_2_9
+   audio_stream_ = audio_stream_new(-1, 0); /* -1 means that function will 
choose some free port */
+-#else
++#elseif MEDIASTREAMER_LESS_2_14
+   audio_stream_ = audio_stream_new(-1, -1, 0); /* -1 means that function will 
choose some free port */
++#else
++  audio_stream_ = audio_stream_new(NULL, -1, -1, 0); /* -1 means that 
function will choose some free port */
+ #endif
+ 
+ }
+@@ -344,16 +354,24 @@ void LinphoneVoiceChannel::StartRing(bool bIncomingCall)
+       if (engine_->GetRingWav().size() > 0)
+       {
+         LOG(LS_VERBOSE) << "incoming ring. sound file: " << 
engine_->GetRingWav().c_str() << "\n";
++#ifdef MEDIASTREAMER_LESS_2_14
+         ring_stream_ = ring_start (engine_->GetRingWav().c_str(), 1, sndcard);
+-      }
++#else
++        ring_stream_ = ring_start (NULL, engine_->GetRingWav().c_str(), 1, 
sndcard);
++#endif
++          }
+     }
+     else
+     {
+       if (engine_->GetCallWav().size() > 0)
+       {
+         LOG(LS_VERBOSE) << "outgoing ring. sound file: " << 
engine_->GetCallWav().c_str() << "\n";
++#ifdef MEDIASTREAMER_LESS_2_14
+         ring_stream_ = ring_start (engine_->GetCallWav().c_str(), 1, sndcard);
+-      }
++#else
++        ring_stream_ = ring_start (NULL, engine_->GetCallWav().c_str(), 1, 
sndcard);
++#endif
++          }
+     }
+   }
+ }

Copied: kdenetwork-kopete/repos/kde-unstable-i686/kopete-pthread-link.patch 
(from rev 293461, kdenetwork-kopete/trunk/kopete-pthread-link.patch)
===================================================================
--- kde-unstable-i686/kopete-pthread-link.patch                         (rev 0)
+++ kde-unstable-i686/kopete-pthread-link.patch 2017-04-20 08:51:10 UTC (rev 
293462)
@@ -0,0 +1,12 @@
+diff --git a/protocols/jabber/libjingle/CMakeLists.txt 
b/protocols/jabber/libjingle/CMakeLists.txt
+index 7ea8c3eb6..4b73085b8 100644
+--- a/protocols/jabber/libjingle/CMakeLists.txt
++++ b/protocols/jabber/libjingle/CMakeLists.txt
+@@ -288,6 +288,7 @@ set ( call_LIBS
+       ${MEDIASTREAMER_LIBRARIES}
+       ${LIBORTP_LIBRARY}
+       ${CMAKE_DL_LIBS}
++        pthread
+ )
+ 
+ if ( NOT WIN32 )

Deleted: kde-unstable-x86_64/PKGBUILD
===================================================================
--- kde-unstable-x86_64/PKGBUILD        2017-04-20 08:50:42 UTC (rev 293461)
+++ kde-unstable-x86_64/PKGBUILD        2017-04-20 08:51:10 UTC (rev 293462)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Maintainer: Antonio Rojas <aro...@archlinux.org>
-# Contributor: Andrea Scarpino <and...@archlinux.org>
-
-pkgname=kdenetwork-kopete
-pkgver=17.03.90
-pkgrel=1
-pkgdesc='Instant Messenger'
-url='https://kde.org/applications/internet/kopete/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde-applications' 'kdenetwork')
-depends=('kdebase-runtime' 'libotr' 'qimageblitz' 'kdepimlibs4')
-makedepends=('cmake' 'automoc4' 'boost' 'mediastreamer' 'libgadu' 'jsoncpp')
-optdepends=('mediastreamer: jingle support' 'libgadu: Gadu-Gadu protocol')
-source=("https://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz"{,.sig}
 
-        kopete-mediastreamer2.14.patch kopete-pthread-link.patch)
-sha256sums=('329ea6a7920f30a21416784e202d7f54fa548e1718723cb64f52845676d656a6'
-            'SKIP'
-            'c34a268aaa058e563174581dbe37c15fed91e82326ec704d2a872463139865e0'
-            'a7ebdd8dd4336b7ec085ef254bf18040f473b73379a8cd84569b28441a6c71df')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid 
<aa...@kde.org>
-
-prepare() {
-  mkdir -p build
-
-# Fix build with mediastreamer 2.14
-  cd kopete-$pkgver
-  patch -p1 -i ../kopete-mediastreamer2.14.patch
-# Fix linking to pthread in libjingle-call
-  patch -p1 -i ../kopete-pthread-link.patch
-}
-
-build() {
-  cd build
-  cmake ../kopete-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DWITH_Libmsn=OFF \
-    -DOPENSSL_INCLUDE_DIR=/usr/include/openssl-1.0 \
-    -DOPENSSL_SSL_LIBRARY=/usr/lib/openssl-1.0/libssl.so \
-    -DOPENSSL_CRYPTO_LIBRARY=/usr/lib/openssl-1.0/libcrypto.so
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: kdenetwork-kopete/repos/kde-unstable-x86_64/PKGBUILD (from rev 293461, 
kdenetwork-kopete/trunk/PKGBUILD)
===================================================================
--- kde-unstable-x86_64/PKGBUILD                                (rev 0)
+++ kde-unstable-x86_64/PKGBUILD        2017-04-20 08:51:10 UTC (rev 293462)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Maintainer: Antonio Rojas <aro...@archlinux.org>
+# Contributor: Andrea Scarpino <and...@archlinux.org>
+
+pkgname=kdenetwork-kopete
+pkgver=17.04.0
+pkgrel=1
+pkgdesc='Instant Messenger'
+url='https://kde.org/applications/internet/kopete/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde-applications' 'kdenetwork')
+depends=('kdebase-runtime' 'libotr' 'qimageblitz' 'kdepimlibs4' 'qca-qt4')
+makedepends=('cmake' 'automoc4' 'boost' 'mediastreamer' 'libgadu' 'jsoncpp')
+optdepends=('mediastreamer: jingle support' 'libgadu: Gadu-Gadu protocol')
+source=("https://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz"{,.sig}
 
+        kopete-mediastreamer2.14.patch kopete-pthread-link.patch)
+sha256sums=('50dab3e927a992bb30a801edb1dab50526ab0f04744b558be15a17b94f2cb3f1'
+            'SKIP'
+            'c34a268aaa058e563174581dbe37c15fed91e82326ec704d2a872463139865e0'
+            'a7ebdd8dd4336b7ec085ef254bf18040f473b73379a8cd84569b28441a6c71df')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid 
<aa...@kde.org>
+
+prepare() {
+  mkdir -p build
+
+# Fix build with mediastreamer 2.14
+  cd kopete-$pkgver
+  patch -p1 -i ../kopete-mediastreamer2.14.patch
+# Fix linking to pthread in libjingle-call
+  patch -p1 -i ../kopete-pthread-link.patch
+}
+
+build() {
+  cd build
+  cmake ../kopete-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DWITH_Libmsn=OFF \
+    -DOPENSSL_INCLUDE_DIR=/usr/include/openssl-1.0 \
+    -DOPENSSL_SSL_LIBRARY=/usr/lib/openssl-1.0/libssl.so \
+    -DOPENSSL_CRYPTO_LIBRARY=/usr/lib/openssl-1.0/libcrypto.so
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Deleted: kde-unstable-x86_64/kopete-mediastreamer2.14.patch
===================================================================
--- kde-unstable-x86_64/kopete-mediastreamer2.14.patch  2017-04-20 08:50:42 UTC 
(rev 293461)
+++ kde-unstable-x86_64/kopete-mediastreamer2.14.patch  2017-04-20 08:51:10 UTC 
(rev 293462)
@@ -1,83 +0,0 @@
-diff --git a/cmake/modules/FindMediastreamer.cmake 
b/cmake/modules/FindMediastreamer.cmake
-index 47fe5c3..31802f0 100644
---- a/cmake/modules/FindMediastreamer.cmake
-+++ b/cmake/modules/FindMediastreamer.cmake
-@@ -24,12 +24,19 @@ IF (MEDIASTREAMER_FOUND)
-       IF (MEDIASTREAMER_VERSION VERSION_LESS 2.9)
-           SET(MEDIASTREAMER_LESS_2_9 TRUE)
-           SET(MEDIASTREAMER_LESS_2_11 TRUE)
-+          SET(MEDIASTREAMER_LESS_2_14 TRUE)
-       ELSEIF (MEDIASTREAMER_VERSION VERSION_LESS 2.11)
-           SET(MEDIASTREAMER_LESS_2_9 FALSE)
-           SET(MEDIASTREAMER_LESS_2_11 TRUE)
-+          SET(MEDIASTREAMER_LESS_2_14 TRUE)
-+      ELSEIF (MEDIASTREAMER_VERSION VERSION_LESS 2.14)
-+          SET(MEDIASTREAMER_LESS_2_9 FALSE)
-+          SET(MEDIASTREAMER_LESS_2_11 FALSE)
-+          SET(MEDIASTREAMER_LESS_2_14 TRUE)
-       ELSE (MEDIASTREAMER_VERSION VERSION_LESS 2.9)
-           SET(MEDIASTREAMER_LESS_2_9 FALSE)
-           SET(MEDIASTREAMER_LESS_2_11 FALSE)
-+          SET(MEDIASTREAMER_LESS_2_14 FALSE)
-       ENDIF (MEDIASTREAMER_VERSION VERSION_LESS 2.9)
-   ENDIF (NOT MEDIASTREAMER_FIND_QUIETLY)
- ELSE (MEDIASTREAMER_FOUND)
-diff --git 
a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc 
b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
-index bd3de2b..9379226 100644
---- a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
-+++ b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
-@@ -151,15 +151,25 @@ 
LinphoneVoiceChannel::LinphoneVoiceChannel(LinphoneMediaEngine*eng)
-   playport2 = PORT_UNUSED;
- 
- #ifdef _DEBUG
-+#ifdef MEDIASTREAMER_LESS_2_14
-   
ortp_set_log_level_mask(ORTP_DEBUG|ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
- #else
-+  ortp_set_log_level_mask(NULL, 
ORTP_DEBUG|ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
-+#endif
-+#else
-+#ifdef MEDIASTREAMER_LESS_2_14
-   ortp_set_log_level_mask(ORTP_FATAL);
-+#else
-+  ortp_set_log_level_mask(NULL, ORTP_FATAL);
- #endif
--
-+#endif
-+  
- #ifdef MEDIASTREAMER_LESS_2_9
-   audio_stream_ = audio_stream_new(-1, 0); /* -1 means that function will 
choose some free port */
--#else
-+#elseif MEDIASTREAMER_LESS_2_14
-   audio_stream_ = audio_stream_new(-1, -1, 0); /* -1 means that function will 
choose some free port */
-+#else
-+  audio_stream_ = audio_stream_new(NULL, -1, -1, 0); /* -1 means that 
function will choose some free port */
- #endif
- 
- }
-@@ -344,16 +354,24 @@ void LinphoneVoiceChannel::StartRing(bool bIncomingCall)
-       if (engine_->GetRingWav().size() > 0)
-       {
-         LOG(LS_VERBOSE) << "incoming ring. sound file: " << 
engine_->GetRingWav().c_str() << "\n";
-+#ifdef MEDIASTREAMER_LESS_2_14
-         ring_stream_ = ring_start (engine_->GetRingWav().c_str(), 1, sndcard);
--      }
-+#else
-+        ring_stream_ = ring_start (NULL, engine_->GetRingWav().c_str(), 1, 
sndcard);
-+#endif
-+          }
-     }
-     else
-     {
-       if (engine_->GetCallWav().size() > 0)
-       {
-         LOG(LS_VERBOSE) << "outgoing ring. sound file: " << 
engine_->GetCallWav().c_str() << "\n";
-+#ifdef MEDIASTREAMER_LESS_2_14
-         ring_stream_ = ring_start (engine_->GetCallWav().c_str(), 1, sndcard);
--      }
-+#else
-+        ring_stream_ = ring_start (NULL, engine_->GetCallWav().c_str(), 1, 
sndcard);
-+#endif
-+          }
-     }
-   }
- }

Copied: 
kdenetwork-kopete/repos/kde-unstable-x86_64/kopete-mediastreamer2.14.patch 
(from rev 293461, kdenetwork-kopete/trunk/kopete-mediastreamer2.14.patch)
===================================================================
--- kde-unstable-x86_64/kopete-mediastreamer2.14.patch                          
(rev 0)
+++ kde-unstable-x86_64/kopete-mediastreamer2.14.patch  2017-04-20 08:51:10 UTC 
(rev 293462)
@@ -0,0 +1,83 @@
+diff --git a/cmake/modules/FindMediastreamer.cmake 
b/cmake/modules/FindMediastreamer.cmake
+index 47fe5c3..31802f0 100644
+--- a/cmake/modules/FindMediastreamer.cmake
++++ b/cmake/modules/FindMediastreamer.cmake
+@@ -24,12 +24,19 @@ IF (MEDIASTREAMER_FOUND)
+       IF (MEDIASTREAMER_VERSION VERSION_LESS 2.9)
+           SET(MEDIASTREAMER_LESS_2_9 TRUE)
+           SET(MEDIASTREAMER_LESS_2_11 TRUE)
++          SET(MEDIASTREAMER_LESS_2_14 TRUE)
+       ELSEIF (MEDIASTREAMER_VERSION VERSION_LESS 2.11)
+           SET(MEDIASTREAMER_LESS_2_9 FALSE)
+           SET(MEDIASTREAMER_LESS_2_11 TRUE)
++          SET(MEDIASTREAMER_LESS_2_14 TRUE)
++      ELSEIF (MEDIASTREAMER_VERSION VERSION_LESS 2.14)
++          SET(MEDIASTREAMER_LESS_2_9 FALSE)
++          SET(MEDIASTREAMER_LESS_2_11 FALSE)
++          SET(MEDIASTREAMER_LESS_2_14 TRUE)
+       ELSE (MEDIASTREAMER_VERSION VERSION_LESS 2.9)
+           SET(MEDIASTREAMER_LESS_2_9 FALSE)
+           SET(MEDIASTREAMER_LESS_2_11 FALSE)
++          SET(MEDIASTREAMER_LESS_2_14 FALSE)
+       ENDIF (MEDIASTREAMER_VERSION VERSION_LESS 2.9)
+   ENDIF (NOT MEDIASTREAMER_FIND_QUIETLY)
+ ELSE (MEDIASTREAMER_FOUND)
+diff --git 
a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc 
b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
+index bd3de2b..9379226 100644
+--- a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
++++ b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
+@@ -151,15 +151,25 @@ 
LinphoneVoiceChannel::LinphoneVoiceChannel(LinphoneMediaEngine*eng)
+   playport2 = PORT_UNUSED;
+ 
+ #ifdef _DEBUG
++#ifdef MEDIASTREAMER_LESS_2_14
+   
ortp_set_log_level_mask(ORTP_DEBUG|ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
+ #else
++  ortp_set_log_level_mask(NULL, 
ORTP_DEBUG|ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
++#endif
++#else
++#ifdef MEDIASTREAMER_LESS_2_14
+   ortp_set_log_level_mask(ORTP_FATAL);
++#else
++  ortp_set_log_level_mask(NULL, ORTP_FATAL);
+ #endif
+-
++#endif
++  
+ #ifdef MEDIASTREAMER_LESS_2_9
+   audio_stream_ = audio_stream_new(-1, 0); /* -1 means that function will 
choose some free port */
+-#else
++#elseif MEDIASTREAMER_LESS_2_14
+   audio_stream_ = audio_stream_new(-1, -1, 0); /* -1 means that function will 
choose some free port */
++#else
++  audio_stream_ = audio_stream_new(NULL, -1, -1, 0); /* -1 means that 
function will choose some free port */
+ #endif
+ 
+ }
+@@ -344,16 +354,24 @@ void LinphoneVoiceChannel::StartRing(bool bIncomingCall)
+       if (engine_->GetRingWav().size() > 0)
+       {
+         LOG(LS_VERBOSE) << "incoming ring. sound file: " << 
engine_->GetRingWav().c_str() << "\n";
++#ifdef MEDIASTREAMER_LESS_2_14
+         ring_stream_ = ring_start (engine_->GetRingWav().c_str(), 1, sndcard);
+-      }
++#else
++        ring_stream_ = ring_start (NULL, engine_->GetRingWav().c_str(), 1, 
sndcard);
++#endif
++          }
+     }
+     else
+     {
+       if (engine_->GetCallWav().size() > 0)
+       {
+         LOG(LS_VERBOSE) << "outgoing ring. sound file: " << 
engine_->GetCallWav().c_str() << "\n";
++#ifdef MEDIASTREAMER_LESS_2_14
+         ring_stream_ = ring_start (engine_->GetCallWav().c_str(), 1, sndcard);
+-      }
++#else
++        ring_stream_ = ring_start (NULL, engine_->GetCallWav().c_str(), 1, 
sndcard);
++#endif
++          }
+     }
+   }
+ }

Deleted: kde-unstable-x86_64/kopete-pthread-link.patch
===================================================================
--- kde-unstable-x86_64/kopete-pthread-link.patch       2017-04-20 08:50:42 UTC 
(rev 293461)
+++ kde-unstable-x86_64/kopete-pthread-link.patch       2017-04-20 08:51:10 UTC 
(rev 293462)
@@ -1,12 +0,0 @@
-diff --git a/protocols/jabber/libjingle/CMakeLists.txt 
b/protocols/jabber/libjingle/CMakeLists.txt
-index 7ea8c3eb6..4b73085b8 100644
---- a/protocols/jabber/libjingle/CMakeLists.txt
-+++ b/protocols/jabber/libjingle/CMakeLists.txt
-@@ -288,6 +288,7 @@ set ( call_LIBS
-       ${MEDIASTREAMER_LIBRARIES}
-       ${LIBORTP_LIBRARY}
-       ${CMAKE_DL_LIBS}
-+        pthread
- )
- 
- if ( NOT WIN32 )

Copied: kdenetwork-kopete/repos/kde-unstable-x86_64/kopete-pthread-link.patch 
(from rev 293461, kdenetwork-kopete/trunk/kopete-pthread-link.patch)
===================================================================
--- kde-unstable-x86_64/kopete-pthread-link.patch                               
(rev 0)
+++ kde-unstable-x86_64/kopete-pthread-link.patch       2017-04-20 08:51:10 UTC 
(rev 293462)
@@ -0,0 +1,12 @@
+diff --git a/protocols/jabber/libjingle/CMakeLists.txt 
b/protocols/jabber/libjingle/CMakeLists.txt
+index 7ea8c3eb6..4b73085b8 100644
+--- a/protocols/jabber/libjingle/CMakeLists.txt
++++ b/protocols/jabber/libjingle/CMakeLists.txt
+@@ -288,6 +288,7 @@ set ( call_LIBS
+       ${MEDIASTREAMER_LIBRARIES}
+       ${LIBORTP_LIBRARY}
+       ${CMAKE_DL_LIBS}
++        pthread
+ )
+ 
+ if ( NOT WIN32 )

Reply via email to