public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
Date: Mon,  4 Dec 2017 12:29:34 +0000 (UTC)	[thread overview]
Message-ID: <1512390555.d84b8b4ffb993c6d4e1816964b237dd48300e06e.asturm@gentoo> (raw)

commit:     d84b8b4ffb993c6d4e1816964b237dd48300e06e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  4 12:21:36 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec  4 12:29:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d84b8b4f

media-sound/amarok: Fix cmake warnings

Cosmetics, basically.

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-sound/amarok/amarok-2.8.90-r5.ebuild | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/media-sound/amarok/amarok-2.8.90-r5.ebuild b/media-sound/amarok/amarok-2.8.90-r5.ebuild
index 4ea07c89b53..6243ec7ac44 100644
--- a/media-sound/amarok/amarok-2.8.90-r5.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r5.ebuild
@@ -76,6 +76,14 @@ src_prepare() {
 
 	# requires qtwebkit
 	sed -i -e "s/wikipedia,//" data/amarok_homerc || die
+
+	sed -i -e "/macro_log_feature.*QT_QTOPENGL_FOUND/d" \
+		CMakeLists.txt \
+		|| die "failed to remove QT_QTOPENGL detection"
+
+	sed -i -e "/if/ s/QT_QTOPENGL_FOUND/FALSE/" \
+		src/context/applets/CMakeLists.txt \
+		|| die "failed to sed out QT_QTOPENGL_FOUND"
 }
 
 src_configure() {
@@ -84,13 +92,10 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DWITH_PLAYER=ON
-		-DWITH_Libgcrypt=OFF
-		-DWITH_SPECTRUM_ANALYZER=OFF
 		-DWITH_NepomukCore=OFF
 		-DWITH_Soprano=OFF
 		-DWITH_MYSQL_EMBEDDED=$(usex embedded)
 		-DWITH_IPOD=$(usex ipod)
-		-DWITH_GDKPixBuf=$(usex ipod)
 		-DWITH_LibLastFm=$(usex lastfm)
 		-DWITH_MP3Tunes=$(usex mp3tunes)
 		-DWITH_Mtp=$(usex mtp)
@@ -98,6 +103,9 @@ src_configure() {
 		-DWITH_UTILITIES=$(usex utils)
 	)
 
+	use ipod && mycmakeargs+=( DWITH_GDKPixBuf=ON )
+	use mp3tunes && mycmakeargs+=( -DWITH_Libgcrypt=OFF )
+
 	# bug 581554: add libmysqld location for rpath patch
 	use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" )
 


             reply	other threads:[~2017-12-04 12:29 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-04 12:29 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-16 21:31 [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/ Andreas Sturmlechner
2025-08-30  6:05 Arthur Zamarin
2025-08-17  7:35 Andreas Sturmlechner
2025-08-10 16:16 Andreas Sturmlechner
2025-08-10 16:16 Andreas Sturmlechner
2025-07-08 20:44 Andreas Sturmlechner
2025-07-08 20:44 Andreas Sturmlechner
2025-06-25 22:22 Andreas Sturmlechner
2025-06-25 22:22 Andreas Sturmlechner
2025-04-14 18:01 Andreas Sturmlechner
2017-12-14  8:32 Andreas Sturmlechner
2017-12-09 21:28 Andreas Sturmlechner
2017-12-04 12:29 Andreas Sturmlechner
2017-12-03 23:04 Andreas Sturmlechner
2017-12-03 17:20 Andreas Sturmlechner
2017-12-03 17:20 Andreas Sturmlechner
2017-08-27  9:35 Andreas Sturmlechner
2017-08-17 18:58 Andreas Sturmlechner
2017-08-12 14:31 Michael Palimaka
2017-06-30 17:27 Andreas Sturmlechner
2017-06-30 11:10 Agostino Sarubbo
2017-06-28 13:19 Agostino Sarubbo
2017-02-24 13:38 Agostino Sarubbo
2017-02-24 13:20 Agostino Sarubbo
2016-07-21  9:40 Michael Palimaka
2016-07-07 17:52 Michael Palimaka
2016-05-18 21:50 Johannes Huber
2016-04-19 21:24 Ian Stakenvicius
2015-12-31  9:17 Michael Palimaka
2015-08-12 20:05 Johannes Huber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1512390555.d84b8b4ffb993c6d4e1816964b237dd48300e06e.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox