Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
Date: Mon, 04 Dec 2017 12:29:39
Message-Id: 1512390555.d84b8b4ffb993c6d4e1816964b237dd48300e06e.asturm@gentoo
1 commit: d84b8b4ffb993c6d4e1816964b237dd48300e06e
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 4 12:21:36 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 4 12:29:15 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d84b8b4f
7
8 media-sound/amarok: Fix cmake warnings
9
10 Cosmetics, basically.
11
12 Package-Manager: Portage-2.3.13, Repoman-2.3.4
13
14 media-sound/amarok/amarok-2.8.90-r5.ebuild | 14 +++++++++++---
15 1 file changed, 11 insertions(+), 3 deletions(-)
16
17 diff --git a/media-sound/amarok/amarok-2.8.90-r5.ebuild b/media-sound/amarok/amarok-2.8.90-r5.ebuild
18 index 4ea07c89b53..6243ec7ac44 100644
19 --- a/media-sound/amarok/amarok-2.8.90-r5.ebuild
20 +++ b/media-sound/amarok/amarok-2.8.90-r5.ebuild
21 @@ -76,6 +76,14 @@ src_prepare() {
22
23 # requires qtwebkit
24 sed -i -e "s/wikipedia,//" data/amarok_homerc || die
25 +
26 + sed -i -e "/macro_log_feature.*QT_QTOPENGL_FOUND/d" \
27 + CMakeLists.txt \
28 + || die "failed to remove QT_QTOPENGL detection"
29 +
30 + sed -i -e "/if/ s/QT_QTOPENGL_FOUND/FALSE/" \
31 + src/context/applets/CMakeLists.txt \
32 + || die "failed to sed out QT_QTOPENGL_FOUND"
33 }
34
35 src_configure() {
36 @@ -84,13 +92,10 @@ src_configure() {
37
38 local mycmakeargs=(
39 -DWITH_PLAYER=ON
40 - -DWITH_Libgcrypt=OFF
41 - -DWITH_SPECTRUM_ANALYZER=OFF
42 -DWITH_NepomukCore=OFF
43 -DWITH_Soprano=OFF
44 -DWITH_MYSQL_EMBEDDED=$(usex embedded)
45 -DWITH_IPOD=$(usex ipod)
46 - -DWITH_GDKPixBuf=$(usex ipod)
47 -DWITH_LibLastFm=$(usex lastfm)
48 -DWITH_MP3Tunes=$(usex mp3tunes)
49 -DWITH_Mtp=$(usex mtp)
50 @@ -98,6 +103,9 @@ src_configure() {
51 -DWITH_UTILITIES=$(usex utils)
52 )
53
54 + use ipod && mycmakeargs+=( DWITH_GDKPixBuf=ON )
55 + use mp3tunes && mycmakeargs+=( -DWITH_Libgcrypt=OFF )
56 +
57 # bug 581554: add libmysqld location for rpath patch
58 use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" )