Date: Sunday, February 12, 2017 @ 14:20:39 Author: arojas Revision: 288747
archrelease: copy trunk to extra-i686, extra-x86_64 Added: kdenetwork-kopete/repos/extra-i686/PKGBUILD (from rev 288746, kdenetwork-kopete/trunk/PKGBUILD) kdenetwork-kopete/repos/extra-i686/kopete-mediastreamer2.14.patch (from rev 288746, kdenetwork-kopete/trunk/kopete-mediastreamer2.14.patch) kdenetwork-kopete/repos/extra-x86_64/PKGBUILD (from rev 288746, kdenetwork-kopete/trunk/PKGBUILD) kdenetwork-kopete/repos/extra-x86_64/kopete-mediastreamer2.14.patch (from rev 288746, kdenetwork-kopete/trunk/kopete-mediastreamer2.14.patch) Deleted: kdenetwork-kopete/repos/extra-i686/PKGBUILD kdenetwork-kopete/repos/extra-i686/kopete-mediastreamer2.14.patch kdenetwork-kopete/repos/extra-x86_64/PKGBUILD kdenetwork-kopete/repos/extra-x86_64/kopete-mediastreamer2.14.patch ---------------------------------------------+ /PKGBUILD | 98 +++++++++++++++ /kopete-mediastreamer2.14.patch | 166 ++++++++++++++++++++++++++ extra-i686/PKGBUILD | 45 ------- extra-i686/kopete-mediastreamer2.14.patch | 83 ------------- extra-x86_64/PKGBUILD | 45 ------- extra-x86_64/kopete-mediastreamer2.14.patch | 83 ------------- 6 files changed, 264 insertions(+), 256 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2017-02-12 14:20:09 UTC (rev 288746) +++ extra-i686/PKGBUILD 2017-02-12 14:20:39 UTC (rev 288747) @@ -1,45 +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=16.12.2 -pkgrel=1 -pkgdesc='Instant Messenger' -url='http://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=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz"{,.sig} kopete-mediastreamer2.14.patch) -sha1sums=('2db7a06b424edeb20571115b6d66f2f639562c56' - 'SKIP' - 'b284ffb226cbcc0da6540ecd978d37287aa6eddb') -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 -} - -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 - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install -} Copied: kdenetwork-kopete/repos/extra-i686/PKGBUILD (from rev 288746, kdenetwork-kopete/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2017-02-12 14:20:39 UTC (rev 288747) @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=kdenetwork-kopete +pkgver=16.12.2 +pkgrel=2 +pkgdesc='Instant Messenger' +url='http://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=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz"{,.sig} kopete-mediastreamer2.14.patch + CVE-2017-5593.patch::"https://cgit.kde.org/kopete.git/patch/?id=6243764c") +sha1sums=('2db7a06b424edeb20571115b6d66f2f639562c56' + 'SKIP' + 'b284ffb226cbcc0da6540ecd978d37287aa6eddb' + '1ce697b8fe41f86b56d31a16220319e8c1478c52') +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 CVE-2017-5593 + patch -p1 -i ../CVE-2017-5593.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 + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} Deleted: extra-i686/kopete-mediastreamer2.14.patch =================================================================== --- extra-i686/kopete-mediastreamer2.14.patch 2017-02-12 14:20:09 UTC (rev 288746) +++ extra-i686/kopete-mediastreamer2.14.patch 2017-02-12 14:20:39 UTC (rev 288747) @@ -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/extra-i686/kopete-mediastreamer2.14.patch (from rev 288746, kdenetwork-kopete/trunk/kopete-mediastreamer2.14.patch) =================================================================== --- extra-i686/kopete-mediastreamer2.14.patch (rev 0) +++ extra-i686/kopete-mediastreamer2.14.patch 2017-02-12 14:20:39 UTC (rev 288747) @@ -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: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2017-02-12 14:20:09 UTC (rev 288746) +++ extra-x86_64/PKGBUILD 2017-02-12 14:20:39 UTC (rev 288747) @@ -1,45 +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=16.12.2 -pkgrel=1 -pkgdesc='Instant Messenger' -url='http://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=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz"{,.sig} kopete-mediastreamer2.14.patch) -sha1sums=('2db7a06b424edeb20571115b6d66f2f639562c56' - 'SKIP' - 'b284ffb226cbcc0da6540ecd978d37287aa6eddb') -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 -} - -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 - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install -} Copied: kdenetwork-kopete/repos/extra-x86_64/PKGBUILD (from rev 288746, kdenetwork-kopete/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2017-02-12 14:20:39 UTC (rev 288747) @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=kdenetwork-kopete +pkgver=16.12.2 +pkgrel=2 +pkgdesc='Instant Messenger' +url='http://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=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz"{,.sig} kopete-mediastreamer2.14.patch + CVE-2017-5593.patch::"https://cgit.kde.org/kopete.git/patch/?id=6243764c") +sha1sums=('2db7a06b424edeb20571115b6d66f2f639562c56' + 'SKIP' + 'b284ffb226cbcc0da6540ecd978d37287aa6eddb' + '1ce697b8fe41f86b56d31a16220319e8c1478c52') +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 CVE-2017-5593 + patch -p1 -i ../CVE-2017-5593.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 + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} Deleted: extra-x86_64/kopete-mediastreamer2.14.patch =================================================================== --- extra-x86_64/kopete-mediastreamer2.14.patch 2017-02-12 14:20:09 UTC (rev 288746) +++ extra-x86_64/kopete-mediastreamer2.14.patch 2017-02-12 14:20:39 UTC (rev 288747) @@ -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/extra-x86_64/kopete-mediastreamer2.14.patch (from rev 288746, kdenetwork-kopete/trunk/kopete-mediastreamer2.14.patch) =================================================================== --- extra-x86_64/kopete-mediastreamer2.14.patch (rev 0) +++ extra-x86_64/kopete-mediastreamer2.14.patch 2017-02-12 14:20:39 UTC (rev 288747) @@ -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 ++ } + } + } + }