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 via email to