| 1 |
commit: 22802ddeb04368b7ac9a349424a2b0aab6413a68 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 9 21:43:26 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 9 21:52:57 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=22802dde |
| 7 |
|
| 8 |
kde-apps/kopete: Re-add jingle support |
| 9 |
|
| 10 |
Upstream commits: |
| 11 |
586a2314856075acc11284309acddb274bf7b546 |
| 12 |
059df228e4e08da83a528dfcc6ace2f1231b7382 |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 15 |
|
| 16 |
kde-apps/kopete/kopete-9999.ebuild | 30 +++++++++++++++--------------- |
| 17 |
1 file changed, 15 insertions(+), 15 deletions(-) |
| 18 |
|
| 19 |
diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild |
| 20 |
index 96695e0c2c..689d5269f9 100644 |
| 21 |
--- a/kde-apps/kopete/kopete-9999.ebuild |
| 22 |
+++ b/kde-apps/kopete/kopete-9999.ebuild |
| 23 |
@@ -44,7 +44,7 @@ otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence |
| 24 |
# groupwise: app-crypt/qca:2 |
| 25 |
# irc: NO DEPS, probably will fail so inform user about it |
| 26 |
# xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK |
| 27 |
-# jingle: BROKEN (media-libs/speex net-libs/ortp) DISABLED BY UPSTREAM |
| 28 |
+# jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM |
| 29 |
# meanwhile: net-libs/meanwhile |
| 30 |
# oscar: NO DEPS |
| 31 |
# telepathy: net-libs/decibel |
| 32 |
@@ -53,7 +53,8 @@ otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence |
| 33 |
# yahoo: media-libs/jasper |
| 34 |
# zeroconf (bonjour): NO DEPS |
| 35 |
# DISABLED until fixed: skype sms |
| 36 |
-PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp yahoo zeroconf" |
| 37 |
+PROTOCOLS="gadu groupwise jingle meanwhile oscar |
| 38 |
+testbed winpopup +xmpp yahoo zeroconf" |
| 39 |
|
| 40 |
# disabled protocols |
| 41 |
# telepathy: net-libs/decibel |
| 42 |
@@ -92,6 +93,14 @@ COMMONDEPEND=" |
| 43 |
x11-libs/libXScrnSaver |
| 44 |
gadu? ( >=net-libs/libgadu-1.8.0[threads] ) |
| 45 |
groupwise? ( app-crypt/qca:2[qt5] ) |
| 46 |
+ jingle? ( |
| 47 |
+ dev-libs/expat |
| 48 |
+ dev-libs/openssl:0 |
| 49 |
+ >=media-libs/mediastreamer-2.3.0 |
| 50 |
+ media-libs/speex |
| 51 |
+ net-libs/libsrtp:= |
| 52 |
+ net-libs/ortp:= |
| 53 |
+ ) |
| 54 |
meanwhile? ( net-libs/meanwhile ) |
| 55 |
otr? ( >=net-libs/libotr-4.0.0 ) |
| 56 |
statistics? ( dev-db/sqlite:3 ) |
| 57 |
@@ -111,14 +120,6 @@ COMMONDEPEND=" |
| 58 |
$(add_kdeapps_dep kidentitymanagement) |
| 59 |
) |
| 60 |
" |
| 61 |
-# jingle? ( |
| 62 |
-# dev-libs/expat |
| 63 |
-# dev-libs/openssl:0 |
| 64 |
-# >=media-libs/mediastreamer-2.3.0 |
| 65 |
-# media-libs/speex |
| 66 |
-# net-libs/libsrtp:= |
| 67 |
-# net-libs/ortp:= |
| 68 |
-# ) |
| 69 |
RDEPEND="${COMMONDEPEND} |
| 70 |
latex? ( |
| 71 |
|| ( |
| 72 |
@@ -133,8 +134,8 @@ RDEPEND="${COMMONDEPEND} |
| 73 |
# winpopup? ( net-fs/samba ) |
| 74 |
DEPEND="${COMMONDEPEND} |
| 75 |
x11-proto/scrnsaverproto |
| 76 |
+ jingle? ( dev-libs/jsoncpp ) |
| 77 |
" |
| 78 |
-# jingle? ( dev-libs/jsoncpp ) |
| 79 |
|
| 80 |
src_configure() { |
| 81 |
local x x2 |
| 82 |
@@ -142,12 +143,11 @@ src_configure() { |
| 83 |
local mycmakeargs=( |
| 84 |
-DCMAKE_DISABLE_FIND_PACKAGE_Libmsn=ON |
| 85 |
-DWITH_qq=OFF |
| 86 |
+ $(cmake-utils_use_find_package jingle LiboRTP) |
| 87 |
+ $(cmake-utils_use_find_package jingle Mediastreamer) |
| 88 |
+ $(cmake-utils_use_find_package jingle Speex) |
| 89 |
-DDISABLE_VIDEOSUPPORT=$(usex !v4l) |
| 90 |
) |
| 91 |
-# $(cmake-utils_use_find_package jingle LiboRTP) |
| 92 |
-# $(cmake-utils_use_find_package jingle Mediastreamer) |
| 93 |
-# $(cmake-utils_use_find_package jingle Speex) |
| 94 |
- |
| 95 |
# enable protocols |
| 96 |
for x in ${PROTOCOLS}; do |
| 97 |
case ${x/+/} in |
Archives