[arch-commits] Commit in kdenetwork-kopete/kde-unstable (2 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Sat Jun 15 16:12:00 UTC 2013
Date: Saturday, June 15, 2013 @ 18:12:00
Author: andrea
Revision: 188566
upgpkg: kdenetwork-kopete 4.10.80-1
Enable jingle support
Added:
kdenetwork-kopete/kde-unstable/mediastreamer29.patch
Modified:
kdenetwork-kopete/kde-unstable/PKGBUILD
-----------------------+
PKGBUILD | 14 +++++++++-----
mediastreamer29.patch | 22 ++++++++++++++++++++++
2 files changed, 31 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-06-15 12:40:50 UTC (rev 188565)
+++ PKGBUILD 2013-06-15 16:12:00 UTC (rev 188566)
@@ -10,17 +10,20 @@
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdenetwork')
depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn' 'libidn'
- 'qimageblitz' 'libgadu' 'mediastreamer')
-makedepends=('cmake' 'automoc4')
+ 'qimageblitz' 'libgadu' 'mediastreamer' 'jsoncpp')
+makedepends=('cmake' 'automoc4' 'boost')
install=${pkgname}.install
source=("http://download.kde.org/unstable/${pkgver}/src/kopete-${pkgver}.tar.xz"
- 'libotr3.patch')
+ 'libotr3.patch'
+ 'mediastreamer29.patch')
sha1sums=('ee9fccbd612f821f5c1a02a0ec107b4faf4cc94c'
- '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
+ '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
+ '317683a5c2acd0a0058c5ab42f6006e9db511ef3')
prepare() {
cd kopete-${pkgver}
patch -p2 -i "${srcdir}"/libotr3.patch
+ patch -p1 -i "${srcdir}"/mediastreamer29.patch
}
build() {
@@ -29,7 +32,8 @@
cmake ../kopete-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_SKIP_RPATH=ON
make
}
Added: mediastreamer29.patch
===================================================================
--- mediastreamer29.patch (rev 0)
+++ mediastreamer29.patch 2013-06-15 16:12:00 UTC (rev 188566)
@@ -0,0 +1,22 @@
+diff --git a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
+index 88fdbd1..57c6c05 100644
+--- a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
++++ b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
+@@ -200,7 +200,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
+ LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate;
+ pt_ = i->id;
+ audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */
+- port2 = rtp_session_get_local_port(audio_stream_->session);
++ port2 = rtp_session_get_local_port(audio_stream_->ms.session);
+ first = false;
+ }
+ }
+@@ -211,7 +211,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
+ // working with a buggy client; let's try PCMU.
+ LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000";
+ audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */
+- port2 = rtp_session_get_local_port(audio_stream_->session);
++ port2 = rtp_session_get_local_port(audio_stream_->ms.session);
+ }
+
+ return true;
More information about the arch-commits
mailing list