[arch-commits] Commit in kdenetwork-kopete/repos (8 files)
Antonio Rojas
arojas at archlinux.org
Wed Apr 5 09:18:42 UTC 2017
Date: Wednesday, April 5, 2017 @ 09:18:41
Author: arojas
Revision: 292097
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
kdenetwork-kopete/repos/staging-i686/
kdenetwork-kopete/repos/staging-i686/PKGBUILD
(from rev 292096, kdenetwork-kopete/trunk/PKGBUILD)
kdenetwork-kopete/repos/staging-i686/kopete-mediastreamer2.14.patch
(from rev 292096, kdenetwork-kopete/trunk/kopete-mediastreamer2.14.patch)
kdenetwork-kopete/repos/staging-i686/kopete-pthread-link.patch
(from rev 292096, kdenetwork-kopete/trunk/kopete-pthread-link.patch)
kdenetwork-kopete/repos/staging-x86_64/
kdenetwork-kopete/repos/staging-x86_64/PKGBUILD
(from rev 292096, kdenetwork-kopete/trunk/PKGBUILD)
kdenetwork-kopete/repos/staging-x86_64/kopete-mediastreamer2.14.patch
(from rev 292096, kdenetwork-kopete/trunk/kopete-mediastreamer2.14.patch)
kdenetwork-kopete/repos/staging-x86_64/kopete-pthread-link.patch
(from rev 292096, kdenetwork-kopete/trunk/kopete-pthread-link.patch)
-----------------------------------------------+
staging-i686/PKGBUILD | 53 +++++++++++++++
staging-i686/kopete-mediastreamer2.14.patch | 83 ++++++++++++++++++++++++
staging-i686/kopete-pthread-link.patch | 12 +++
staging-x86_64/PKGBUILD | 53 +++++++++++++++
staging-x86_64/kopete-mediastreamer2.14.patch | 83 ++++++++++++++++++++++++
staging-x86_64/kopete-pthread-link.patch | 12 +++
6 files changed, 296 insertions(+)
Copied: kdenetwork-kopete/repos/staging-i686/PKGBUILD (from rev 292096, kdenetwork-kopete/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2017-04-05 09:18:41 UTC (rev 292097)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kdenetwork-kopete
+pkgver=16.12.3
+pkgrel=3
+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=('61be9e45cb08e42a00bdc0e99f5d7ad7872299ac2e104124a3c0d939422376b6'
+ 'SKIP'
+ 'c34a268aaa058e563174581dbe37c15fed91e82326ec704d2a872463139865e0'
+ 'a7ebdd8dd4336b7ec085ef254bf18040f473b73379a8cd84569b28441a6c71df')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at 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 \
+ -DCMAKE_LD_FLAGS="$LDFLAGS -lpthread" \
+ -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 VERBOSE=1
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: kdenetwork-kopete/repos/staging-i686/kopete-mediastreamer2.14.patch (from rev 292096, kdenetwork-kopete/trunk/kopete-mediastreamer2.14.patch)
===================================================================
--- staging-i686/kopete-mediastreamer2.14.patch (rev 0)
+++ staging-i686/kopete-mediastreamer2.14.patch 2017-04-05 09:18:41 UTC (rev 292097)
@@ -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/staging-i686/kopete-pthread-link.patch (from rev 292096, kdenetwork-kopete/trunk/kopete-pthread-link.patch)
===================================================================
--- staging-i686/kopete-pthread-link.patch (rev 0)
+++ staging-i686/kopete-pthread-link.patch 2017-04-05 09:18:41 UTC (rev 292097)
@@ -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 )
Copied: kdenetwork-kopete/repos/staging-x86_64/PKGBUILD (from rev 292096, kdenetwork-kopete/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2017-04-05 09:18:41 UTC (rev 292097)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kdenetwork-kopete
+pkgver=16.12.3
+pkgrel=3
+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=('61be9e45cb08e42a00bdc0e99f5d7ad7872299ac2e104124a3c0d939422376b6'
+ 'SKIP'
+ 'c34a268aaa058e563174581dbe37c15fed91e82326ec704d2a872463139865e0'
+ 'a7ebdd8dd4336b7ec085ef254bf18040f473b73379a8cd84569b28441a6c71df')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at 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 \
+ -DCMAKE_LD_FLAGS="$LDFLAGS -lpthread" \
+ -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 VERBOSE=1
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: kdenetwork-kopete/repos/staging-x86_64/kopete-mediastreamer2.14.patch (from rev 292096, kdenetwork-kopete/trunk/kopete-mediastreamer2.14.patch)
===================================================================
--- staging-x86_64/kopete-mediastreamer2.14.patch (rev 0)
+++ staging-x86_64/kopete-mediastreamer2.14.patch 2017-04-05 09:18:41 UTC (rev 292097)
@@ -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/staging-x86_64/kopete-pthread-link.patch (from rev 292096, kdenetwork-kopete/trunk/kopete-pthread-link.patch)
===================================================================
--- staging-x86_64/kopete-pthread-link.patch (rev 0)
+++ staging-x86_64/kopete-pthread-link.patch 2017-04-05 09:18:41 UTC (rev 292097)
@@ -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 )
More information about the arch-commits
mailing list