| 1 |
commit: 12521e5911210536d27112af6b63db41663a907a |
| 2 |
Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Mar 4 18:38:42 2017 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 4 20:08:46 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12521e59 |
| 7 |
|
| 8 |
media-sound/clementine: remove vkontakte USE flag |
| 9 |
|
| 10 |
Due to vk.com disabled it's public music API the corresponding |
| 11 |
functionality in clementine doesn't work anymore and was removed from |
| 12 |
the git, so disable it premanenly in recent release and remove the USE |
| 13 |
from the live version. |
| 14 |
|
| 15 |
See https://github.com/clementine-player/Clementine/issues/5591 |
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/4121 |
| 17 |
|
| 18 |
...mentine-9999.ebuild => clementine-1.3.1-r6.ebuild} | 19 ++++++++++--------- |
| 19 |
media-sound/clementine/clementine-9999.ebuild | 3 +-- |
| 20 |
2 files changed, 11 insertions(+), 11 deletions(-) |
| 21 |
|
| 22 |
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-1.3.1-r6.ebuild |
| 23 |
similarity index 89% |
| 24 |
copy from media-sound/clementine/clementine-9999.ebuild |
| 25 |
copy to media-sound/clementine/clementine-1.3.1-r6.ebuild |
| 26 |
index 66cfb44168c..6dfba6c726c 100644 |
| 27 |
--- a/media-sound/clementine/clementine-9999.ebuild |
| 28 |
+++ b/media-sound/clementine/clementine-1.3.1-r6.ebuild |
| 29 |
@@ -19,12 +19,11 @@ LICENSE="GPL-3" |
| 30 |
SLOT="0" |
| 31 |
[[ ${PV} == *9999* ]] || \ |
| 32 |
KEYWORDS="~amd64 ~x86" |
| 33 |
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks udisks_legacy vkontakte wiimote" |
| 34 |
+IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks wiimote" |
| 35 |
IUSE+="${LANGS// / linguas_}" |
| 36 |
|
| 37 |
REQUIRED_USE=" |
| 38 |
udisks? ( dbus ) |
| 39 |
- udisks_legacy? ( dbus ) |
| 40 |
wiimote? ( dbus ) |
| 41 |
" |
| 42 |
|
| 43 |
@@ -64,8 +63,7 @@ COMMON_DEPEND=" |
| 44 |
# 06-fix-numeric-locale.patch |
| 45 |
# 08-stdlib.h-for-rand.patch |
| 46 |
RDEPEND="${COMMON_DEPEND} |
| 47 |
- dbus? ( udisks? ( sys-fs/udisks:2 ) |
| 48 |
- udisks_legacy? ( sys-fs/udisks:0 ) ) |
| 49 |
+ dbus? ( udisks? ( sys-fs/udisks:0 ) ) |
| 50 |
mms? ( media-plugins/gst-plugins-libmms:1.0 ) |
| 51 |
mtp? ( gnome-base/gvfs[mtp] ) |
| 52 |
media-plugins/gst-plugins-meta:1.0 |
| 53 |
@@ -78,10 +76,10 @@ DEPEND="${COMMON_DEPEND} |
| 54 |
sys-devel/gettext |
| 55 |
dev-qt/qttest:4 |
| 56 |
dev-cpp/gmock |
| 57 |
+ amazoncloud? ( dev-cpp/sparsehash ) |
| 58 |
box? ( dev-cpp/sparsehash ) |
| 59 |
dropbox? ( dev-cpp/sparsehash ) |
| 60 |
googledrive? ( dev-cpp/sparsehash ) |
| 61 |
- seafile? ( dev-cpp/sparsehash ) |
| 62 |
pulseaudio? ( media-sound/pulseaudio ) |
| 63 |
skydrive? ( dev-cpp/sparsehash ) |
| 64 |
test? ( gnome-base/gsettings-desktop-schemas ) |
| 65 |
@@ -94,6 +92,9 @@ S="${WORKDIR}/${MY_P^}" |
| 66 |
|
| 67 |
PATCHES=( |
| 68 |
"${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch |
| 69 |
+ "${FILESDIR}"/${P}-fix-desktop-file.patch |
| 70 |
+ "${FILESDIR}"/${P}-chromaprint14.patch #603662 |
| 71 |
+ "${FILESDIR}"/${P}-libechonest_removal.patch |
| 72 |
) |
| 73 |
|
| 74 |
src_prepare() { |
| 75 |
@@ -115,10 +116,10 @@ src_configure() { |
| 76 |
local mycmakeargs=( |
| 77 |
-DBUILD_WERROR=OFF |
| 78 |
-DLINGUAS="${langs}" |
| 79 |
+ -DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)" |
| 80 |
-DENABLE_AUDIOCD="$(usex cdda)" |
| 81 |
-DENABLE_DBUS="$(usex dbus)" |
| 82 |
- -DENABLE_UDISKS2="$(usex udisks)" |
| 83 |
- -DENABLE_DEVICEKIT="$(usex udisks_legacy)" |
| 84 |
+ -DENABLE_DEVICEKIT="$(usex udisks)" |
| 85 |
-DENABLE_LIBGPOD="$(usex ipod)" |
| 86 |
-DENABLE_LIBLASTFM="$(usex lastfm)" |
| 87 |
-DENABLE_LIBMTP="$(usex mtp)" |
| 88 |
@@ -130,9 +131,7 @@ src_configure() { |
| 89 |
-DENABLE_DROPBOX="$(usex dropbox)" |
| 90 |
-DENABLE_GOOGLE_DRIVE="$(usex googledrive)" |
| 91 |
-DENABLE_LIBPULSE="$(usex pulseaudio)" |
| 92 |
- -DENABLE_SEAFILE="$(usex seafile)" |
| 93 |
-DENABLE_SKYDRIVE="$(usex skydrive)" |
| 94 |
- -DENABLE_VK="$(usex vkontakte)" |
| 95 |
-DENABLE_SPOTIFY_BLOB=OFF |
| 96 |
-DENABLE_BREAKPAD=OFF #< disable crash reporting |
| 97 |
-DUSE_BUILTIN_TAGLIB=OFF |
| 98 |
@@ -144,6 +143,8 @@ src_configure() { |
| 99 |
-DCRYPTOPP_FOUND=ON |
| 100 |
# avoid automagically enabling of ccache (bug #611010) |
| 101 |
-DCCACHE_EXECUTABLE=OFF |
| 102 |
+ # see https://github.com/clementine-player/Clementine/issues/5591 |
| 103 |
+ -DENABLE_VK=OFF |
| 104 |
) |
| 105 |
|
| 106 |
use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT |
| 107 |
|
| 108 |
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild |
| 109 |
index 66cfb44168c..bfe62ae2d81 100644 |
| 110 |
--- a/media-sound/clementine/clementine-9999.ebuild |
| 111 |
+++ b/media-sound/clementine/clementine-9999.ebuild |
| 112 |
@@ -19,7 +19,7 @@ LICENSE="GPL-3" |
| 113 |
SLOT="0" |
| 114 |
[[ ${PV} == *9999* ]] || \ |
| 115 |
KEYWORDS="~amd64 ~x86" |
| 116 |
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks udisks_legacy vkontakte wiimote" |
| 117 |
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks udisks_legacy wiimote" |
| 118 |
IUSE+="${LANGS// / linguas_}" |
| 119 |
|
| 120 |
REQUIRED_USE=" |
| 121 |
@@ -132,7 +132,6 @@ src_configure() { |
| 122 |
-DENABLE_LIBPULSE="$(usex pulseaudio)" |
| 123 |
-DENABLE_SEAFILE="$(usex seafile)" |
| 124 |
-DENABLE_SKYDRIVE="$(usex skydrive)" |
| 125 |
- -DENABLE_VK="$(usex vkontakte)" |
| 126 |
-DENABLE_SPOTIFY_BLOB=OFF |
| 127 |
-DENABLE_BREAKPAD=OFF #< disable crash reporting |
| 128 |
-DUSE_BUILTIN_TAGLIB=OFF |
Archives