kdenetwork-kopete-16.08.1-1.parabola1{,.nonprism1}: updating version

2 files changed, 93 insertions, 4 deletions

diff --git a/libre/kdenetwork-kopete/PKGBUILD b/libre/kdenetwork-kopete/PKGBUILD
index f2786cc66..38fc7dea5 100644
--- a/libre/kdenetwork-kopete/PKGBUILD
+++ b/libre/kdenetwork-kopete/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 274414 2016-08-21 03:38:03Z felixonmars $
+# $Id: PKGBUILD 275851 2016-09-08 15:18:47Z arojas $
 # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
 # Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=kdenetwork-kopete
-pkgver=16.08.0
+pkgver=16.08.1
 pkgrel=1.parabola1
 pkgdesc='Instant Messenger, without nonfree Skype support'
 url='http://kde.org/applications/internet/kopete/'
@@ -17,8 +17,10 @@ conflicts=(${pkgname}-libre)
 depends=('kdebase-runtime' 'libotr' 'qimageblitz' 'jsoncpp')
 makedepends=('cmake' 'automoc4' 'boost' 'mediastreamer' 'libgadu')
 optdepends=('mediastreamer: jingle support' 'libgadu: Gadu-Gadu protocol')
-source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz")
-sha1sums=('e722841470df3c832ed551db600d7ea9f421bfc5')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz"
+        'kopete-mediastreamer2.14.patch')
+sha1sums=('6f3fd40ab617a2b57e587e7376a246229921b845'
+          'b284ffb226cbcc0da6540ecd978d37287aa6eddb')
 
 prepare() {
   cd kopete-$pkgver
@@ -27,6 +29,10 @@ prepare() {
   sed 's/, Skype//' -i doc/index.docbook
   cd ..
   mkdir -p build
+
+# Fix build with mediastreamer 2.14
+  cd kopete-$pkgver
+  patch -p1 -i ../kopete-mediastreamer2.14.patch
 }
 
 build() {
diff --git a/libre/kdenetwork-kopete/kopete-mediastreamer2.14.patch b/libre/kdenetwork-kopete/kopete-mediastreamer2.14.patch
new file mode 100644
index 000000000..f4ee1a096
--- /dev/null
+++ b/libre/kdenetwork-kopete/kopete-mediastreamer2.14.patch
@@ -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
++          }
+     }
+   }
+ }