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 78528138262 for ; Thu, 19 May 2016 13:25:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F3FA21C039; Thu, 19 May 2016 13:25:29 +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 C91C721C039 for ; Thu, 19 May 2016 13:25:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 1286D340D48 for ; Thu, 19 May 2016 13:25:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4074233E for ; Thu, 19 May 2016 13:25:24 +0000 (UTC) From: "Tiziano Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tiziano Müller" Message-ID: <1463664319.02192655d3351e4a640b607bc4d253f324896ea1.dev-zero@gentoo> Subject: [gentoo-commits] dev/dev-zero:master commit in: media-sound/clementine/, media-sound/clementine/files/ X-VCS-Repository: dev/dev-zero X-VCS-Files: media-sound/clementine/Manifest media-sound/clementine/clementine-1.3.1-r1.ebuild media-sound/clementine/clementine-1.3_rc1-r2.ebuild media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch media-sound/clementine/files/clementine-1.3.1-cmake.patch media-sound/clementine/files/clementine-1.3_rc1-cmake-2.patch media-sound/clementine/files/clementine-1.3_rc1-fix-tokenizer.patch X-VCS-Directories: media-sound/clementine/ media-sound/clementine/files/ X-VCS-Committer: dev-zero X-VCS-Committer-Name: Tiziano Müller X-VCS-Revision: 02192655d3351e4a640b607bc4d253f324896ea1 X-VCS-Branch: master Date: Thu, 19 May 2016 13:25:24 +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: ab5f76be-46ab-41cf-abb1-fd6878ebaa22 X-Archives-Hash: 1872e0dbc71b0ceb53e93b5896190069 commit: 02192655d3351e4a640b607bc4d253f324896ea1 Author: Tiziano Müller gentoo org> AuthorDate: Thu May 19 13:25:19 2016 +0000 Commit: Tiziano Müller gentoo org> CommitDate: Thu May 19 13:25:19 2016 +0000 URL: https://gitweb.gentoo.org/dev/dev-zero.git/commit/?id=02192655 media-sound/clementine: bump version with libspotify usage media-sound/clementine/Manifest | 4 +- ....3_rc1-r2.ebuild => clementine-1.3.1-r1.ebuild} | 80 +++++++++++----------- ...er.patch => clementine-1.3-fix-tokenizer.patch} | 4 +- ...-cmake-2.patch => clementine-1.3.1-cmake.patch} | 9 --- 4 files changed, 42 insertions(+), 55 deletions(-) diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest index 9a18ea5..cc01afb 100644 --- a/media-sound/clementine/Manifest +++ b/media-sound/clementine/Manifest @@ -1,3 +1 @@ -DIST clementine-1.2.2.tar.gz 9076752 SHA256 1f674c42f05c476baf74f1dd37b1aa357ff9199e4493173052c856a53e5f0a96 SHA512 48e934ed1f18724c4cc79eaf7ac16dcb2ecc9d268a4986a8a421c6518d7a13bd81a5b7d249b4ff146c860bed520a59d2062139fb57672609019b8c2c84e495ca WHIRLPOOL 13c3f129566c0789e67b23b2382d7ed1f756221647c4b2cc1b4b1b1efcb5e04571837a843c8ff7c099f9bcd3f9b1dd481b1fa75fe1c4b27e90169026e8880840 -DIST clementine-1.2.3.tar.gz 9076977 SHA256 7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf SHA512 fd43a7dcfec360d4478a56d0600300b6913b294f127afb0249971b45b54b48475d128861e06885c482bbdd37b09aa56b1c238675763fdb8c50329005b066bec3 WHIRLPOOL 23d0fb971118b0d73ec4a52cfa3f8829118ab65c12fb01ce30433541f5da081b52c5dd485aa0efdda2b4b57b286f59702aa686f9b7ce17a0a2595b208b95d524 -DIST clementine-1.3_rc1.tar.gz 8477665 SHA256 f08b797b47305b8a0b7e1713d11977df12e09911f05c577c9f81641369f252a0 SHA512 973410a0d2baf0646a77eb5bcbea2af3f34a4baa5671f7a81fa99203703c478d38dd2f32ce0ccac9babf8add56717fd5fdec8a4bacefe8b9b8fa0256ec509edb WHIRLPOOL 968ca43b4a15169926ad68a009c568ae03ef17e8b0542fe6c4ebd07fc4e64ae6782ab63d3a05851064e288522e44e885a9a1dc52b94246e016c60c91e41e0a76 +DIST clementine-1.3.1.tar.gz 8501827 SHA256 f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c SHA512 1942a046be24a583b5e2095dd39dc736c1b14a47dc4aad61d6252c1fccf745c26d7b35da907a220d5dc8c0736f5b589d050ed9582de343aa3cb5abc607001790 WHIRLPOOL 20a57177dc740865f35c407b981e146d9ddec6aff39e662a27dfe0e238f3baa87b331cc6dc50eebf848279c8860fb74454b4997924e2d4d93357a870364af1a7 diff --git a/media-sound/clementine/clementine-1.3_rc1-r2.ebuild b/media-sound/clementine/clementine-1.3.1-r1.ebuild similarity index 64% rename from media-sound/clementine/clementine-1.3_rc1-r2.ebuild rename to media-sound/clementine/clementine-1.3.1-r1.ebuild index 2138d90..706599e 100644 --- a/media-sound/clementine/clementine-1.3_rc1-r2.ebuild +++ b/media-sound/clementine/clementine-1.3.1-r1.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 spotify test ubuntu-one +udisks wiimote" +IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive spotify 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 @@ -55,17 +54,20 @@ 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 ) spotify? ( >=media-libs/libspotify-12.1.45 ) " -# 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,26 +78,23 @@ 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-2.patch - "${FILESDIR}"/${PN}-1.3_rc1-fix-tokenizer.patch + "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch + "${FILESDIR}"/${P}-cmake.patch ) src_prepare() { @@ -113,34 +112,33 @@ src_configure() { use linguas_${x} && langs+=" ${x}" done + # spotify is not in portage 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) - $(cmake-utils_use spotify ENABLE_SPOTIFY_BLOB) - -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_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="$(usex spotify)" + -DENABLE_BREAKPAD=OFF #< disable crash reporting -DUSE_BUILTIN_TAGLIB=OFF -DUSE_SYSTEM_GMOCK=ON + -DUSE_SYSTEM_PROJECTM=ON + -DBUNDLE_PROJECTM_PRESETS=OFF ) use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT @@ -150,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-fix-tokenizer.patch b/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch similarity index 91% rename from media-sound/clementine/files/clementine-1.3_rc1-fix-tokenizer.patch rename to media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch index 6413bf7..4375186 100644 --- a/media-sound/clementine/files/clementine-1.3_rc1-fix-tokenizer.patch +++ b/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch @@ -1,7 +1,7 @@ https://github.com/clementine-player/Clementine/issues/5297 ---- src/core/database.cpp -+++ src/core/database.cpp +--- a/src/core/database.cpp ++++ b/src/core/database.cpp @@ -265,6 +265,16 @@ StaticInit(); diff --git a/media-sound/clementine/files/clementine-1.3_rc1-cmake-2.patch b/media-sound/clementine/files/clementine-1.3.1-cmake.patch similarity index 77% rename from media-sound/clementine/files/clementine-1.3_rc1-cmake-2.patch rename to media-sound/clementine/files/clementine-1.3.1-cmake.patch index 5694602..3dc6264 100644 --- a/media-sound/clementine/files/clementine-1.3_rc1-cmake-2.patch +++ b/media-sound/clementine/files/clementine-1.3.1-cmake.patch @@ -14,15 +14,6 @@ index 831c323..c137bce 100644 pkg_check_modules(GIO gio-2.0) pkg_check_modules(GLIB REQUIRED glib-2.0) pkg_check_modules(GOBJECT REQUIRED gobject-2.0) -@@ -71,7 +69,7 @@ pkg_check_modules(GSTREAMER_BASE REQUIRED gstreamer-base-1.0) - pkg_check_modules(GSTREAMER_TAG REQUIRED gstreamer-tag-1.0) - pkg_check_modules(LIBGPOD libgpod-1.0>=0.7.92) - pkg_check_modules(LIBMTP libmtp>=1.0) --pkg_check_modules(LIBMYGPO_QT libmygpo-qt>=1.0.9) -+pkg_check_modules(LIBMYGPO_QT libmygpo-qt>=1.0.8) - pkg_check_modules(LIBPULSE libpulse) - pkg_check_modules(LIBXML libxml-2.0) - pkg_check_modules(QJSON REQUIRED QJson) @@ -275,13 +273,8 @@ optional_component(LIBPULSE ON "Pulse audio integration" optional_component(VISUALISATIONS ON "Visualisations")