From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C49C1138222 for ; Tue, 3 May 2016 15:00:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B59121C002; Tue, 3 May 2016 15:00:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7730721C002 for ; Tue, 3 May 2016 15:00:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1D22F340896 for ; Tue, 3 May 2016 14:59:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 227BD16 for ; Tue, 3 May 2016 14:59:56 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1462286939.30db61f8b0b251adb75237b0535199436e04a71e.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/clementine/clementine-1.3.1.ebuild media-sound/clementine/clementine-1.3.ebuild media-sound/clementine/clementine-9999.ebuild media-sound/clementine/files/clementine-1.3_rc1-cmake.patch media-sound/clementine/metadata.xml X-VCS-Directories: media-sound/clementine/ media-sound/clementine/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 30db61f8b0b251adb75237b0535199436e04a71e X-VCS-Branch: master Date: Tue, 3 May 2016 14:59:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 52704c69-e046-4e89-8482-e9ec1a9740eb X-Archives-Hash: 38ce93e8c98345a4db669dd6816765d1 commit: 30db61f8b0b251adb75237b0535199436e04a71e Author: Alexander Golubev gmail com> AuthorDate: Sat Apr 30 15:21:30 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue May 3 14:48:59 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30db61f8 media-sound/clementine: several cleanups and fixes - Clean up dependencies - Fix dependencies upon dev-libs/crypto++ (see 580134) - Synchronise live ebuild with latest release - Remove obsolte comments - Reorder cmake params - Reenable testing - add missing USE flags: * added 3 missing USE flags in ebuilds of recent version: amazoncloud, pulseaudio and vkontakte * removed USE=ubuntu-one due to remove in upstream * slightly change description for other USEs Signed-off-by: Lars Wendler gentoo.org> media-sound/clementine/clementine-1.3.1.ebuild | 49 +++++++------- media-sound/clementine/clementine-1.3.ebuild | 49 +++++++------- media-sound/clementine/clementine-9999.ebuild | 78 +++++++++++----------- .../files/clementine-1.3_rc1-cmake.patch | 32 --------- media-sound/clementine/metadata.xml | 4 +- 5 files changed, 92 insertions(+), 120 deletions(-) diff --git a/media-sound/clementine/clementine-1.3.1.ebuild b/media-sound/clementine/clementine-1.3.1.ebuild index 2e12657..b348bfe 100644 --- a/media-sound/clementine/clementine-1.3.1.ebuild +++ b/media-sound/clementine/clementine-1.3.1.ebuild @@ -9,7 +9,7 @@ EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW" inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx -[[ ${PV} == *9999* ]] && inherit git-2 +[[ ${PV} == *9999* ]] && inherit git-r3 DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4" HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine" @@ -20,7 +20,7 @@ LICENSE="GPL-3" SLOT="0" [[ ${PV} == *9999* ]] || \ KEYWORDS="~amd64 ~x86" -IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote" +IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote" IUSE+="${LANGS// / linguas_}" REQUIRED_USE=" @@ -28,7 +28,6 @@ REQUIRED_USE=" wiimote? ( dbus ) " -# qca dep is temporary for bug #489850 COMMON_DEPEND=" dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 @@ -38,7 +37,7 @@ COMMON_DEPEND=" >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 - >=dev-qt/qtsql-4.5:4[sqlite] + >=dev-qt/qtsql-4.5:4 >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 @@ -46,6 +45,7 @@ COMMON_DEPEND=" >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib + dev-libs/crypto++ virtual/glu virtual/opengl x11-libs/libX11 @@ -55,16 +55,19 @@ COMMON_DEPEND=" lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) - projectm? ( media-libs/glew:= ) + projectm? ( media-libs/glew:= + >=media-libs/libprojectm-1.2.0 ) " -# now only presets are used, libprojectm is internal +# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; +# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; check the clementine's patches: # https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches -# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS" +# Still possibly essential but not applied yet patches are: +# 06-fix-numeric-locale.patch +# 08-stdlib.h-for-rand.patch RDEPEND="${COMMON_DEPEND} dbus? ( udisks? ( sys-fs/udisks:2 ) ) mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs ) - projectm? ( >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 @@ -75,27 +78,21 @@ DEPEND="${COMMON_DEPEND} sys-devel/gettext dev-qt/qttest:4 dev-cpp/gmock + amazoncloud? ( dev-cpp/sparsehash ) box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) + pulseaudio? ( media-sound/pulseaudio ) skydrive? ( dev-cpp/sparsehash ) - ubuntu-one? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) " -DOCS="Changelog" - -# https://github.com/clementine-player/Clementine/issues/3935 -RESTRICT="test" +DOCS=(Changelog README.md) MY_P="${P/_}" -# Switch to ^ when we switch to EAPI=6. [[ ${PV} == *9999* ]] || \ -S="${WORKDIR}/C${MY_P:1}" +S="${WORKDIR}/${MY_P^}" -PATCHES=( - "${FILESDIR}/${PN}-1.3_rc1-cmake.patch" - "${FILESDIR}/${PN}-1.3-fix-tokenizer.patch" -) +PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch ) src_prepare() { cmake-utils_src_prepare @@ -116,8 +113,7 @@ src_configure() { local mycmakeargs=( -DBUILD_WERROR=OFF -DLINGUAS="${langs}" - -DBUNDLE_PROJECTM_PRESETS=OFF - -DUSE_SYSTEM_PROJECTM=ON + -DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)" -DENABLE_AUDIOCD="$(usex cdda)" -DENABLE_DBUS="$(usex dbus)" -DENABLE_DEVICEKIT="$(usex udisks)" @@ -128,16 +124,21 @@ src_configure() { -DENABLE_GIO=ON -DENABLE_WIIMOTEDEV="$(usex wiimote)" -DENABLE_VISUALISATIONS="$(usex projectm)" - $(usex projectm '-DUSE_SYSTEM_PROJECTM=ON' '') -DENABLE_BOX="$(usex box)" -DENABLE_DROPBOX="$(usex dropbox)" -DENABLE_GOOGLE_DRIVE="$(usex googledrive)" + -DENABLE_LIBPULSE="$(usex pulseaudio)" -DENABLE_SKYDRIVE="$(usex skydrive)" - -DENABLE_UBUNTU_ONE="$(usex ubuntu-one)" + -DENABLE_VK="$(usex vkontakte)" -DENABLE_SPOTIFY_BLOB=OFF - -DENABLE_BREAKPAD=OFF + -DENABLE_BREAKPAD=OFF #< disable crash reporting -DUSE_BUILTIN_TAGLIB=OFF -DUSE_SYSTEM_GMOCK=ON + -DUSE_SYSTEM_PROJECTM=ON + -DBUNDLE_PROJECTM_PRESETS=OFF + # force to find crypto++ see bug #548544 + -DCRYPTOPP_LIBRARIES="crypto++" + -DCRYPTOPP_FOUND=ON ) use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT diff --git a/media-sound/clementine/clementine-1.3.ebuild b/media-sound/clementine/clementine-1.3.ebuild index 2e12657..b348bfe 100644 --- a/media-sound/clementine/clementine-1.3.ebuild +++ b/media-sound/clementine/clementine-1.3.ebuild @@ -9,7 +9,7 @@ EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW" inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx -[[ ${PV} == *9999* ]] && inherit git-2 +[[ ${PV} == *9999* ]] && inherit git-r3 DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4" HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine" @@ -20,7 +20,7 @@ LICENSE="GPL-3" SLOT="0" [[ ${PV} == *9999* ]] || \ KEYWORDS="~amd64 ~x86" -IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote" +IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote" IUSE+="${LANGS// / linguas_}" REQUIRED_USE=" @@ -28,7 +28,6 @@ REQUIRED_USE=" wiimote? ( dbus ) " -# qca dep is temporary for bug #489850 COMMON_DEPEND=" dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 @@ -38,7 +37,7 @@ COMMON_DEPEND=" >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 - >=dev-qt/qtsql-4.5:4[sqlite] + >=dev-qt/qtsql-4.5:4 >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 @@ -46,6 +45,7 @@ COMMON_DEPEND=" >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib + dev-libs/crypto++ virtual/glu virtual/opengl x11-libs/libX11 @@ -55,16 +55,19 @@ COMMON_DEPEND=" lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) - projectm? ( media-libs/glew:= ) + projectm? ( media-libs/glew:= + >=media-libs/libprojectm-1.2.0 ) " -# now only presets are used, libprojectm is internal +# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; +# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; check the clementine's patches: # https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches -# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS" +# Still possibly essential but not applied yet patches are: +# 06-fix-numeric-locale.patch +# 08-stdlib.h-for-rand.patch RDEPEND="${COMMON_DEPEND} dbus? ( udisks? ( sys-fs/udisks:2 ) ) mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs ) - projectm? ( >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 @@ -75,27 +78,21 @@ DEPEND="${COMMON_DEPEND} sys-devel/gettext dev-qt/qttest:4 dev-cpp/gmock + amazoncloud? ( dev-cpp/sparsehash ) box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) + pulseaudio? ( media-sound/pulseaudio ) skydrive? ( dev-cpp/sparsehash ) - ubuntu-one? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) " -DOCS="Changelog" - -# https://github.com/clementine-player/Clementine/issues/3935 -RESTRICT="test" +DOCS=(Changelog README.md) MY_P="${P/_}" -# Switch to ^ when we switch to EAPI=6. [[ ${PV} == *9999* ]] || \ -S="${WORKDIR}/C${MY_P:1}" +S="${WORKDIR}/${MY_P^}" -PATCHES=( - "${FILESDIR}/${PN}-1.3_rc1-cmake.patch" - "${FILESDIR}/${PN}-1.3-fix-tokenizer.patch" -) +PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch ) src_prepare() { cmake-utils_src_prepare @@ -116,8 +113,7 @@ src_configure() { local mycmakeargs=( -DBUILD_WERROR=OFF -DLINGUAS="${langs}" - -DBUNDLE_PROJECTM_PRESETS=OFF - -DUSE_SYSTEM_PROJECTM=ON + -DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)" -DENABLE_AUDIOCD="$(usex cdda)" -DENABLE_DBUS="$(usex dbus)" -DENABLE_DEVICEKIT="$(usex udisks)" @@ -128,16 +124,21 @@ src_configure() { -DENABLE_GIO=ON -DENABLE_WIIMOTEDEV="$(usex wiimote)" -DENABLE_VISUALISATIONS="$(usex projectm)" - $(usex projectm '-DUSE_SYSTEM_PROJECTM=ON' '') -DENABLE_BOX="$(usex box)" -DENABLE_DROPBOX="$(usex dropbox)" -DENABLE_GOOGLE_DRIVE="$(usex googledrive)" + -DENABLE_LIBPULSE="$(usex pulseaudio)" -DENABLE_SKYDRIVE="$(usex skydrive)" - -DENABLE_UBUNTU_ONE="$(usex ubuntu-one)" + -DENABLE_VK="$(usex vkontakte)" -DENABLE_SPOTIFY_BLOB=OFF - -DENABLE_BREAKPAD=OFF + -DENABLE_BREAKPAD=OFF #< disable crash reporting -DUSE_BUILTIN_TAGLIB=OFF -DUSE_SYSTEM_GMOCK=ON + -DUSE_SYSTEM_PROJECTM=ON + -DBUNDLE_PROJECTM_PRESETS=OFF + # force to find crypto++ see bug #548544 + -DCRYPTOPP_LIBRARIES="crypto++" + -DCRYPTOPP_FOUND=ON ) use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild index bfac234..b348bfe 100644 --- a/media-sound/clementine/clementine-9999.ebuild +++ b/media-sound/clementine/clementine-9999.ebuild @@ -2,14 +2,14 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW" inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx -[[ ${PV} == *9999* ]] && inherit git-2 +[[ ${PV} == *9999* ]] && inherit git-r3 DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4" HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine" @@ -20,7 +20,7 @@ LICENSE="GPL-3" SLOT="0" [[ ${PV} == *9999* ]] || \ KEYWORDS="~amd64 ~x86" -IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote" +IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote" IUSE+="${LANGS// / linguas_}" REQUIRED_USE=" @@ -28,7 +28,6 @@ REQUIRED_USE=" wiimote? ( dbus ) " -# qca dep is temporary for bug #489850 COMMON_DEPEND=" dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 @@ -38,7 +37,7 @@ COMMON_DEPEND=" >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 - >=dev-qt/qtsql-4.5:4[sqlite] + >=dev-qt/qtsql-4.5:4 >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 @@ -46,6 +45,7 @@ COMMON_DEPEND=" >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib + dev-libs/crypto++ virtual/glu virtual/opengl x11-libs/libX11 @@ -55,17 +55,19 @@ COMMON_DEPEND=" lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) - projectm? ( media-libs/glew:= ) - >=dev-libs/crypto++-5.6.2-r4 + projectm? ( media-libs/glew:= + >=media-libs/libprojectm-1.2.0 ) " -# now only presets are used, libprojectm is internal +# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; +# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; check the clementine's patches: # https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches -# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS" +# Still possibly essential but not applied yet patches are: +# 06-fix-numeric-locale.patch +# 08-stdlib.h-for-rand.patch RDEPEND="${COMMON_DEPEND} dbus? ( udisks? ( sys-fs/udisks:2 ) ) mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs ) - projectm? ( >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 @@ -76,22 +78,19 @@ DEPEND="${COMMON_DEPEND} sys-devel/gettext dev-qt/qttest:4 dev-cpp/gmock + amazoncloud? ( dev-cpp/sparsehash ) box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) + pulseaudio? ( media-sound/pulseaudio ) skydrive? ( dev-cpp/sparsehash ) - ubuntu-one? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) " -DOCS="Changelog" - -# https://github.com/clementine-player/Clementine/issues/3935 -RESTRICT="test" +DOCS=(Changelog README.md) MY_P="${P/_}" -# Switch to ^ when we switch to EAPI=6. [[ ${PV} == *9999* ]] || \ -S="${WORKDIR}/C${MY_P:1}" +S="${WORKDIR}/${MY_P^}" PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch ) @@ -114,31 +113,32 @@ src_configure() { local mycmakeargs=( -DBUILD_WERROR=OFF -DLINGUAS="${langs}" - -DBUNDLE_PROJECTM_PRESETS=OFF - -DUSE_SYSTEM_PROJECTM=ON - $(cmake-utils_use cdda ENABLE_AUDIOCD) - $(cmake-utils_use dbus ENABLE_DBUS) - $(cmake-utils_use udisks ENABLE_DEVICEKIT) - $(cmake-utils_use ipod ENABLE_LIBGPOD) - $(cmake-utils_use lastfm ENABLE_LIBLASTFM) - $(cmake-utils_use mtp ENABLE_LIBMTP) - $(cmake-utils_use moodbar ENABLE_MOODBAR) + -DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)" + -DENABLE_AUDIOCD="$(usex cdda)" + -DENABLE_DBUS="$(usex dbus)" + -DENABLE_DEVICEKIT="$(usex udisks)" + -DENABLE_LIBGPOD="$(usex ipod)" + -DENABLE_LIBLASTFM="$(usex lastfm)" + -DENABLE_LIBMTP="$(usex mtp)" + -DENABLE_MOODBAR="$(usex moodbar)" -DENABLE_GIO=ON - $(cmake-utils_use wiimote ENABLE_WIIMOTEDEV) - $(cmake-utils_use projectm ENABLE_VISUALISATIONS) - $(usex projectm '-DUSE_SYSTEM_PROJECTM=ON' '') - $(cmake-utils_use box ENABLE_BOX) - $(cmake-utils_use dropbox ENABLE_DROPBOX) - $(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE) - $(cmake-utils_use skydrive ENABLE_SKYDRIVE) - $(cmake-utils_use ubuntu-one ENABLE_UBUNTU_ONE) + -DENABLE_WIIMOTEDEV="$(usex wiimote)" + -DENABLE_VISUALISATIONS="$(usex projectm)" + -DENABLE_BOX="$(usex box)" + -DENABLE_DROPBOX="$(usex dropbox)" + -DENABLE_GOOGLE_DRIVE="$(usex googledrive)" + -DENABLE_LIBPULSE="$(usex pulseaudio)" + -DENABLE_SKYDRIVE="$(usex skydrive)" + -DENABLE_VK="$(usex vkontakte)" -DENABLE_SPOTIFY_BLOB=OFF - -DENABLE_BREAKPAD=OFF - #$(cmake-utils_use !system-sqlite STATIC_SQLITE) - #$(cmake-utils_use system-sqlite I_HATE_MY_USERS) - #$(cmake-utils_use system-sqlite MY_USERS_WILL_SUFFER_BECAUSE_OF_ME) + -DENABLE_BREAKPAD=OFF #< disable crash reporting -DUSE_BUILTIN_TAGLIB=OFF -DUSE_SYSTEM_GMOCK=ON + -DUSE_SYSTEM_PROJECTM=ON + -DBUNDLE_PROJECTM_PRESETS=OFF + # force to find crypto++ see bug #548544 + -DCRYPTOPP_LIBRARIES="crypto++" + -DCRYPTOPP_FOUND=ON ) use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT @@ -148,7 +148,7 @@ src_configure() { src_test() { cd "${CMAKE_BUILD_DIR}" || die - Xemake test + virtx emake test } pkg_preinst() { diff --git a/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch b/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch deleted file mode 100644 index 22a922b..0000000 --- a/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- Clementine-1.3rc1/CMakeLists.txt -+++ Clementine-1.3rc1/CMakeLists.txt -@@ -60,7 +60,7 @@ - - pkg_check_modules(CDIO libcdio) - pkg_check_modules(CHROMAPRINT REQUIRED libchromaprint) --pkg_search_module(CRYPTOPP cryptopp libcrypto++) -+#pkg_search_module(CRYPTOPP cryptopp libcrypto++) - pkg_check_modules(GIO gio-2.0) - pkg_check_modules(GLIB REQUIRED glib-2.0) - pkg_check_modules(GOBJECT REQUIRED gobject-2.0) -@@ -275,13 +275,14 @@ - - optional_component(VISUALISATIONS ON "Visualisations") - --if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND) -- message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify " -- "code must be compiled in") --elseif(CRYPTOPP_FOUND) -+#if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND) -+# message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify " -+# "code must be compiled in") -+#elseif(CRYPTOPP_FOUND) - set(HAVE_CRYPTOPP ON) -- set(HAVE_SPOTIFY_DOWNLOADER ON) --endif() -+ set(HAVE_SPOTIFY_DOWNLOADER OFF) -+ set(HAVE_SPOTIFY_BLOB OFF) -+#endif() - - # Find DBus if it's enabled - if (HAVE_DBUS) diff --git a/media-sound/clementine/metadata.xml b/media-sound/clementine/metadata.xml index eda2d27..64bd4a1 100644 --- a/media-sound/clementine/metadata.xml +++ b/media-sound/clementine/metadata.xml @@ -14,7 +14,8 @@ Gentoo Sound project - Enable Box support + Enable Amazon cloud drive support + Enable filesharing via Box.com Enable Dropbox support Enable Google Drive support Use liblastfm for fetching song info, scrobbling and radio streams @@ -23,6 +24,7 @@ Enable Skydrive support Use the system-wide dev-db/sqlite installation Enable Ubuntu One support + Enable vk.com support Enable support for Wii remote