1 |
commit: 30db61f8b0b251adb75237b0535199436e04a71e |
2 |
Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Apr 30 15:21:30 2016 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 3 14:48:59 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30db61f8 |
7 |
|
8 |
media-sound/clementine: several cleanups and fixes |
9 |
|
10 |
- Clean up dependencies |
11 |
- Fix dependencies upon dev-libs/crypto++ (see 580134) |
12 |
- Synchronise live ebuild with latest release |
13 |
- Remove obsolte comments |
14 |
- Reorder cmake params |
15 |
- Reenable testing |
16 |
- add missing USE flags: |
17 |
* added 3 missing USE flags in ebuilds of recent version: amazoncloud, |
18 |
pulseaudio and vkontakte |
19 |
* removed USE=ubuntu-one due to remove in upstream |
20 |
* slightly change description for other USEs |
21 |
|
22 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
23 |
|
24 |
media-sound/clementine/clementine-1.3.1.ebuild | 49 +++++++------- |
25 |
media-sound/clementine/clementine-1.3.ebuild | 49 +++++++------- |
26 |
media-sound/clementine/clementine-9999.ebuild | 78 +++++++++++----------- |
27 |
.../files/clementine-1.3_rc1-cmake.patch | 32 --------- |
28 |
media-sound/clementine/metadata.xml | 4 +- |
29 |
5 files changed, 92 insertions(+), 120 deletions(-) |
30 |
|
31 |
diff --git a/media-sound/clementine/clementine-1.3.1.ebuild b/media-sound/clementine/clementine-1.3.1.ebuild |
32 |
index 2e12657..b348bfe 100644 |
33 |
--- a/media-sound/clementine/clementine-1.3.1.ebuild |
34 |
+++ b/media-sound/clementine/clementine-1.3.1.ebuild |
35 |
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" |
36 |
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" |
37 |
|
38 |
inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx |
39 |
-[[ ${PV} == *9999* ]] && inherit git-2 |
40 |
+[[ ${PV} == *9999* ]] && inherit git-r3 |
41 |
|
42 |
DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4" |
43 |
HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine" |
44 |
@@ -20,7 +20,7 @@ LICENSE="GPL-3" |
45 |
SLOT="0" |
46 |
[[ ${PV} == *9999* ]] || \ |
47 |
KEYWORDS="~amd64 ~x86" |
48 |
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote" |
49 |
+IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote" |
50 |
IUSE+="${LANGS// / linguas_}" |
51 |
|
52 |
REQUIRED_USE=" |
53 |
@@ -28,7 +28,6 @@ REQUIRED_USE=" |
54 |
wiimote? ( dbus ) |
55 |
" |
56 |
|
57 |
-# qca dep is temporary for bug #489850 |
58 |
COMMON_DEPEND=" |
59 |
dev-db/sqlite:= |
60 |
>=dev-libs/glib-2.24.1-r1 |
61 |
@@ -38,7 +37,7 @@ COMMON_DEPEND=" |
62 |
>=dev-qt/qtcore-4.5:4 |
63 |
>=dev-qt/qtgui-4.5:4 |
64 |
>=dev-qt/qtopengl-4.5:4 |
65 |
- >=dev-qt/qtsql-4.5:4[sqlite] |
66 |
+ >=dev-qt/qtsql-4.5:4 |
67 |
>=media-libs/chromaprint-0.6 |
68 |
media-libs/gstreamer:1.0 |
69 |
media-libs/gst-plugins-base:1.0 |
70 |
@@ -46,6 +45,7 @@ COMMON_DEPEND=" |
71 |
>=media-libs/libmygpo-qt-1.0.8 |
72 |
>=media-libs/taglib-1.8[mp4] |
73 |
sys-libs/zlib |
74 |
+ dev-libs/crypto++ |
75 |
virtual/glu |
76 |
virtual/opengl |
77 |
x11-libs/libX11 |
78 |
@@ -55,16 +55,19 @@ COMMON_DEPEND=" |
79 |
lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) |
80 |
mtp? ( >=media-libs/libmtp-1.0.0 ) |
81 |
moodbar? ( sci-libs/fftw:3.0 ) |
82 |
- projectm? ( media-libs/glew:= ) |
83 |
+ projectm? ( media-libs/glew:= |
84 |
+ >=media-libs/libprojectm-1.2.0 ) |
85 |
" |
86 |
-# now only presets are used, libprojectm is internal |
87 |
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; |
88 |
+# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; check the clementine's patches: |
89 |
# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches |
90 |
-# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS" |
91 |
+# Still possibly essential but not applied yet patches are: |
92 |
+# 06-fix-numeric-locale.patch |
93 |
+# 08-stdlib.h-for-rand.patch |
94 |
RDEPEND="${COMMON_DEPEND} |
95 |
dbus? ( udisks? ( sys-fs/udisks:2 ) ) |
96 |
mms? ( media-plugins/gst-plugins-libmms:1.0 ) |
97 |
mtp? ( gnome-base/gvfs ) |
98 |
- projectm? ( >=media-libs/libprojectm-1.2.0 ) |
99 |
media-plugins/gst-plugins-meta:1.0 |
100 |
media-plugins/gst-plugins-soup:1.0 |
101 |
media-plugins/gst-plugins-taglib:1.0 |
102 |
@@ -75,27 +78,21 @@ DEPEND="${COMMON_DEPEND} |
103 |
sys-devel/gettext |
104 |
dev-qt/qttest:4 |
105 |
dev-cpp/gmock |
106 |
+ amazoncloud? ( dev-cpp/sparsehash ) |
107 |
box? ( dev-cpp/sparsehash ) |
108 |
dropbox? ( dev-cpp/sparsehash ) |
109 |
googledrive? ( dev-cpp/sparsehash ) |
110 |
+ pulseaudio? ( media-sound/pulseaudio ) |
111 |
skydrive? ( dev-cpp/sparsehash ) |
112 |
- ubuntu-one? ( dev-cpp/sparsehash ) |
113 |
test? ( gnome-base/gsettings-desktop-schemas ) |
114 |
" |
115 |
-DOCS="Changelog" |
116 |
- |
117 |
-# https://github.com/clementine-player/Clementine/issues/3935 |
118 |
-RESTRICT="test" |
119 |
+DOCS=(Changelog README.md) |
120 |
|
121 |
MY_P="${P/_}" |
122 |
-# Switch to ^ when we switch to EAPI=6. |
123 |
[[ ${PV} == *9999* ]] || \ |
124 |
-S="${WORKDIR}/C${MY_P:1}" |
125 |
+S="${WORKDIR}/${MY_P^}" |
126 |
|
127 |
-PATCHES=( |
128 |
- "${FILESDIR}/${PN}-1.3_rc1-cmake.patch" |
129 |
- "${FILESDIR}/${PN}-1.3-fix-tokenizer.patch" |
130 |
-) |
131 |
+PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch ) |
132 |
|
133 |
src_prepare() { |
134 |
cmake-utils_src_prepare |
135 |
@@ -116,8 +113,7 @@ src_configure() { |
136 |
local mycmakeargs=( |
137 |
-DBUILD_WERROR=OFF |
138 |
-DLINGUAS="${langs}" |
139 |
- -DBUNDLE_PROJECTM_PRESETS=OFF |
140 |
- -DUSE_SYSTEM_PROJECTM=ON |
141 |
+ -DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)" |
142 |
-DENABLE_AUDIOCD="$(usex cdda)" |
143 |
-DENABLE_DBUS="$(usex dbus)" |
144 |
-DENABLE_DEVICEKIT="$(usex udisks)" |
145 |
@@ -128,16 +124,21 @@ src_configure() { |
146 |
-DENABLE_GIO=ON |
147 |
-DENABLE_WIIMOTEDEV="$(usex wiimote)" |
148 |
-DENABLE_VISUALISATIONS="$(usex projectm)" |
149 |
- $(usex projectm '-DUSE_SYSTEM_PROJECTM=ON' '') |
150 |
-DENABLE_BOX="$(usex box)" |
151 |
-DENABLE_DROPBOX="$(usex dropbox)" |
152 |
-DENABLE_GOOGLE_DRIVE="$(usex googledrive)" |
153 |
+ -DENABLE_LIBPULSE="$(usex pulseaudio)" |
154 |
-DENABLE_SKYDRIVE="$(usex skydrive)" |
155 |
- -DENABLE_UBUNTU_ONE="$(usex ubuntu-one)" |
156 |
+ -DENABLE_VK="$(usex vkontakte)" |
157 |
-DENABLE_SPOTIFY_BLOB=OFF |
158 |
- -DENABLE_BREAKPAD=OFF |
159 |
+ -DENABLE_BREAKPAD=OFF #< disable crash reporting |
160 |
-DUSE_BUILTIN_TAGLIB=OFF |
161 |
-DUSE_SYSTEM_GMOCK=ON |
162 |
+ -DUSE_SYSTEM_PROJECTM=ON |
163 |
+ -DBUNDLE_PROJECTM_PRESETS=OFF |
164 |
+ # force to find crypto++ see bug #548544 |
165 |
+ -DCRYPTOPP_LIBRARIES="crypto++" |
166 |
+ -DCRYPTOPP_FOUND=ON |
167 |
) |
168 |
|
169 |
use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT |
170 |
|
171 |
diff --git a/media-sound/clementine/clementine-1.3.ebuild b/media-sound/clementine/clementine-1.3.ebuild |
172 |
index 2e12657..b348bfe 100644 |
173 |
--- a/media-sound/clementine/clementine-1.3.ebuild |
174 |
+++ b/media-sound/clementine/clementine-1.3.ebuild |
175 |
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" |
176 |
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" |
177 |
|
178 |
inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx |
179 |
-[[ ${PV} == *9999* ]] && inherit git-2 |
180 |
+[[ ${PV} == *9999* ]] && inherit git-r3 |
181 |
|
182 |
DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4" |
183 |
HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine" |
184 |
@@ -20,7 +20,7 @@ LICENSE="GPL-3" |
185 |
SLOT="0" |
186 |
[[ ${PV} == *9999* ]] || \ |
187 |
KEYWORDS="~amd64 ~x86" |
188 |
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote" |
189 |
+IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote" |
190 |
IUSE+="${LANGS// / linguas_}" |
191 |
|
192 |
REQUIRED_USE=" |
193 |
@@ -28,7 +28,6 @@ REQUIRED_USE=" |
194 |
wiimote? ( dbus ) |
195 |
" |
196 |
|
197 |
-# qca dep is temporary for bug #489850 |
198 |
COMMON_DEPEND=" |
199 |
dev-db/sqlite:= |
200 |
>=dev-libs/glib-2.24.1-r1 |
201 |
@@ -38,7 +37,7 @@ COMMON_DEPEND=" |
202 |
>=dev-qt/qtcore-4.5:4 |
203 |
>=dev-qt/qtgui-4.5:4 |
204 |
>=dev-qt/qtopengl-4.5:4 |
205 |
- >=dev-qt/qtsql-4.5:4[sqlite] |
206 |
+ >=dev-qt/qtsql-4.5:4 |
207 |
>=media-libs/chromaprint-0.6 |
208 |
media-libs/gstreamer:1.0 |
209 |
media-libs/gst-plugins-base:1.0 |
210 |
@@ -46,6 +45,7 @@ COMMON_DEPEND=" |
211 |
>=media-libs/libmygpo-qt-1.0.8 |
212 |
>=media-libs/taglib-1.8[mp4] |
213 |
sys-libs/zlib |
214 |
+ dev-libs/crypto++ |
215 |
virtual/glu |
216 |
virtual/opengl |
217 |
x11-libs/libX11 |
218 |
@@ -55,16 +55,19 @@ COMMON_DEPEND=" |
219 |
lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) |
220 |
mtp? ( >=media-libs/libmtp-1.0.0 ) |
221 |
moodbar? ( sci-libs/fftw:3.0 ) |
222 |
- projectm? ( media-libs/glew:= ) |
223 |
+ projectm? ( media-libs/glew:= |
224 |
+ >=media-libs/libprojectm-1.2.0 ) |
225 |
" |
226 |
-# now only presets are used, libprojectm is internal |
227 |
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; |
228 |
+# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; check the clementine's patches: |
229 |
# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches |
230 |
-# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS" |
231 |
+# Still possibly essential but not applied yet patches are: |
232 |
+# 06-fix-numeric-locale.patch |
233 |
+# 08-stdlib.h-for-rand.patch |
234 |
RDEPEND="${COMMON_DEPEND} |
235 |
dbus? ( udisks? ( sys-fs/udisks:2 ) ) |
236 |
mms? ( media-plugins/gst-plugins-libmms:1.0 ) |
237 |
mtp? ( gnome-base/gvfs ) |
238 |
- projectm? ( >=media-libs/libprojectm-1.2.0 ) |
239 |
media-plugins/gst-plugins-meta:1.0 |
240 |
media-plugins/gst-plugins-soup:1.0 |
241 |
media-plugins/gst-plugins-taglib:1.0 |
242 |
@@ -75,27 +78,21 @@ DEPEND="${COMMON_DEPEND} |
243 |
sys-devel/gettext |
244 |
dev-qt/qttest:4 |
245 |
dev-cpp/gmock |
246 |
+ amazoncloud? ( dev-cpp/sparsehash ) |
247 |
box? ( dev-cpp/sparsehash ) |
248 |
dropbox? ( dev-cpp/sparsehash ) |
249 |
googledrive? ( dev-cpp/sparsehash ) |
250 |
+ pulseaudio? ( media-sound/pulseaudio ) |
251 |
skydrive? ( dev-cpp/sparsehash ) |
252 |
- ubuntu-one? ( dev-cpp/sparsehash ) |
253 |
test? ( gnome-base/gsettings-desktop-schemas ) |
254 |
" |
255 |
-DOCS="Changelog" |
256 |
- |
257 |
-# https://github.com/clementine-player/Clementine/issues/3935 |
258 |
-RESTRICT="test" |
259 |
+DOCS=(Changelog README.md) |
260 |
|
261 |
MY_P="${P/_}" |
262 |
-# Switch to ^ when we switch to EAPI=6. |
263 |
[[ ${PV} == *9999* ]] || \ |
264 |
-S="${WORKDIR}/C${MY_P:1}" |
265 |
+S="${WORKDIR}/${MY_P^}" |
266 |
|
267 |
-PATCHES=( |
268 |
- "${FILESDIR}/${PN}-1.3_rc1-cmake.patch" |
269 |
- "${FILESDIR}/${PN}-1.3-fix-tokenizer.patch" |
270 |
-) |
271 |
+PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch ) |
272 |
|
273 |
src_prepare() { |
274 |
cmake-utils_src_prepare |
275 |
@@ -116,8 +113,7 @@ src_configure() { |
276 |
local mycmakeargs=( |
277 |
-DBUILD_WERROR=OFF |
278 |
-DLINGUAS="${langs}" |
279 |
- -DBUNDLE_PROJECTM_PRESETS=OFF |
280 |
- -DUSE_SYSTEM_PROJECTM=ON |
281 |
+ -DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)" |
282 |
-DENABLE_AUDIOCD="$(usex cdda)" |
283 |
-DENABLE_DBUS="$(usex dbus)" |
284 |
-DENABLE_DEVICEKIT="$(usex udisks)" |
285 |
@@ -128,16 +124,21 @@ src_configure() { |
286 |
-DENABLE_GIO=ON |
287 |
-DENABLE_WIIMOTEDEV="$(usex wiimote)" |
288 |
-DENABLE_VISUALISATIONS="$(usex projectm)" |
289 |
- $(usex projectm '-DUSE_SYSTEM_PROJECTM=ON' '') |
290 |
-DENABLE_BOX="$(usex box)" |
291 |
-DENABLE_DROPBOX="$(usex dropbox)" |
292 |
-DENABLE_GOOGLE_DRIVE="$(usex googledrive)" |
293 |
+ -DENABLE_LIBPULSE="$(usex pulseaudio)" |
294 |
-DENABLE_SKYDRIVE="$(usex skydrive)" |
295 |
- -DENABLE_UBUNTU_ONE="$(usex ubuntu-one)" |
296 |
+ -DENABLE_VK="$(usex vkontakte)" |
297 |
-DENABLE_SPOTIFY_BLOB=OFF |
298 |
- -DENABLE_BREAKPAD=OFF |
299 |
+ -DENABLE_BREAKPAD=OFF #< disable crash reporting |
300 |
-DUSE_BUILTIN_TAGLIB=OFF |
301 |
-DUSE_SYSTEM_GMOCK=ON |
302 |
+ -DUSE_SYSTEM_PROJECTM=ON |
303 |
+ -DBUNDLE_PROJECTM_PRESETS=OFF |
304 |
+ # force to find crypto++ see bug #548544 |
305 |
+ -DCRYPTOPP_LIBRARIES="crypto++" |
306 |
+ -DCRYPTOPP_FOUND=ON |
307 |
) |
308 |
|
309 |
use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT |
310 |
|
311 |
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild |
312 |
index bfac234..b348bfe 100644 |
313 |
--- a/media-sound/clementine/clementine-9999.ebuild |
314 |
+++ b/media-sound/clementine/clementine-9999.ebuild |
315 |
@@ -2,14 +2,14 @@ |
316 |
# Distributed under the terms of the GNU General Public License v2 |
317 |
# $Id$ |
318 |
|
319 |
-EAPI=5 |
320 |
+EAPI=6 |
321 |
|
322 |
EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" |
323 |
|
324 |
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" |
325 |
|
326 |
inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx |
327 |
-[[ ${PV} == *9999* ]] && inherit git-2 |
328 |
+[[ ${PV} == *9999* ]] && inherit git-r3 |
329 |
|
330 |
DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4" |
331 |
HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine" |
332 |
@@ -20,7 +20,7 @@ LICENSE="GPL-3" |
333 |
SLOT="0" |
334 |
[[ ${PV} == *9999* ]] || \ |
335 |
KEYWORDS="~amd64 ~x86" |
336 |
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote" |
337 |
+IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote" |
338 |
IUSE+="${LANGS// / linguas_}" |
339 |
|
340 |
REQUIRED_USE=" |
341 |
@@ -28,7 +28,6 @@ REQUIRED_USE=" |
342 |
wiimote? ( dbus ) |
343 |
" |
344 |
|
345 |
-# qca dep is temporary for bug #489850 |
346 |
COMMON_DEPEND=" |
347 |
dev-db/sqlite:= |
348 |
>=dev-libs/glib-2.24.1-r1 |
349 |
@@ -38,7 +37,7 @@ COMMON_DEPEND=" |
350 |
>=dev-qt/qtcore-4.5:4 |
351 |
>=dev-qt/qtgui-4.5:4 |
352 |
>=dev-qt/qtopengl-4.5:4 |
353 |
- >=dev-qt/qtsql-4.5:4[sqlite] |
354 |
+ >=dev-qt/qtsql-4.5:4 |
355 |
>=media-libs/chromaprint-0.6 |
356 |
media-libs/gstreamer:1.0 |
357 |
media-libs/gst-plugins-base:1.0 |
358 |
@@ -46,6 +45,7 @@ COMMON_DEPEND=" |
359 |
>=media-libs/libmygpo-qt-1.0.8 |
360 |
>=media-libs/taglib-1.8[mp4] |
361 |
sys-libs/zlib |
362 |
+ dev-libs/crypto++ |
363 |
virtual/glu |
364 |
virtual/opengl |
365 |
x11-libs/libX11 |
366 |
@@ -55,17 +55,19 @@ COMMON_DEPEND=" |
367 |
lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) |
368 |
mtp? ( >=media-libs/libmtp-1.0.0 ) |
369 |
moodbar? ( sci-libs/fftw:3.0 ) |
370 |
- projectm? ( media-libs/glew:= ) |
371 |
- >=dev-libs/crypto++-5.6.2-r4 |
372 |
+ projectm? ( media-libs/glew:= |
373 |
+ >=media-libs/libprojectm-1.2.0 ) |
374 |
" |
375 |
-# now only presets are used, libprojectm is internal |
376 |
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; |
377 |
+# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; check the clementine's patches: |
378 |
# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches |
379 |
-# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS" |
380 |
+# Still possibly essential but not applied yet patches are: |
381 |
+# 06-fix-numeric-locale.patch |
382 |
+# 08-stdlib.h-for-rand.patch |
383 |
RDEPEND="${COMMON_DEPEND} |
384 |
dbus? ( udisks? ( sys-fs/udisks:2 ) ) |
385 |
mms? ( media-plugins/gst-plugins-libmms:1.0 ) |
386 |
mtp? ( gnome-base/gvfs ) |
387 |
- projectm? ( >=media-libs/libprojectm-1.2.0 ) |
388 |
media-plugins/gst-plugins-meta:1.0 |
389 |
media-plugins/gst-plugins-soup:1.0 |
390 |
media-plugins/gst-plugins-taglib:1.0 |
391 |
@@ -76,22 +78,19 @@ DEPEND="${COMMON_DEPEND} |
392 |
sys-devel/gettext |
393 |
dev-qt/qttest:4 |
394 |
dev-cpp/gmock |
395 |
+ amazoncloud? ( dev-cpp/sparsehash ) |
396 |
box? ( dev-cpp/sparsehash ) |
397 |
dropbox? ( dev-cpp/sparsehash ) |
398 |
googledrive? ( dev-cpp/sparsehash ) |
399 |
+ pulseaudio? ( media-sound/pulseaudio ) |
400 |
skydrive? ( dev-cpp/sparsehash ) |
401 |
- ubuntu-one? ( dev-cpp/sparsehash ) |
402 |
test? ( gnome-base/gsettings-desktop-schemas ) |
403 |
" |
404 |
-DOCS="Changelog" |
405 |
- |
406 |
-# https://github.com/clementine-player/Clementine/issues/3935 |
407 |
-RESTRICT="test" |
408 |
+DOCS=(Changelog README.md) |
409 |
|
410 |
MY_P="${P/_}" |
411 |
-# Switch to ^ when we switch to EAPI=6. |
412 |
[[ ${PV} == *9999* ]] || \ |
413 |
-S="${WORKDIR}/C${MY_P:1}" |
414 |
+S="${WORKDIR}/${MY_P^}" |
415 |
|
416 |
PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch ) |
417 |
|
418 |
@@ -114,31 +113,32 @@ src_configure() { |
419 |
local mycmakeargs=( |
420 |
-DBUILD_WERROR=OFF |
421 |
-DLINGUAS="${langs}" |
422 |
- -DBUNDLE_PROJECTM_PRESETS=OFF |
423 |
- -DUSE_SYSTEM_PROJECTM=ON |
424 |
- $(cmake-utils_use cdda ENABLE_AUDIOCD) |
425 |
- $(cmake-utils_use dbus ENABLE_DBUS) |
426 |
- $(cmake-utils_use udisks ENABLE_DEVICEKIT) |
427 |
- $(cmake-utils_use ipod ENABLE_LIBGPOD) |
428 |
- $(cmake-utils_use lastfm ENABLE_LIBLASTFM) |
429 |
- $(cmake-utils_use mtp ENABLE_LIBMTP) |
430 |
- $(cmake-utils_use moodbar ENABLE_MOODBAR) |
431 |
+ -DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)" |
432 |
+ -DENABLE_AUDIOCD="$(usex cdda)" |
433 |
+ -DENABLE_DBUS="$(usex dbus)" |
434 |
+ -DENABLE_DEVICEKIT="$(usex udisks)" |
435 |
+ -DENABLE_LIBGPOD="$(usex ipod)" |
436 |
+ -DENABLE_LIBLASTFM="$(usex lastfm)" |
437 |
+ -DENABLE_LIBMTP="$(usex mtp)" |
438 |
+ -DENABLE_MOODBAR="$(usex moodbar)" |
439 |
-DENABLE_GIO=ON |
440 |
- $(cmake-utils_use wiimote ENABLE_WIIMOTEDEV) |
441 |
- $(cmake-utils_use projectm ENABLE_VISUALISATIONS) |
442 |
- $(usex projectm '-DUSE_SYSTEM_PROJECTM=ON' '') |
443 |
- $(cmake-utils_use box ENABLE_BOX) |
444 |
- $(cmake-utils_use dropbox ENABLE_DROPBOX) |
445 |
- $(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE) |
446 |
- $(cmake-utils_use skydrive ENABLE_SKYDRIVE) |
447 |
- $(cmake-utils_use ubuntu-one ENABLE_UBUNTU_ONE) |
448 |
+ -DENABLE_WIIMOTEDEV="$(usex wiimote)" |
449 |
+ -DENABLE_VISUALISATIONS="$(usex projectm)" |
450 |
+ -DENABLE_BOX="$(usex box)" |
451 |
+ -DENABLE_DROPBOX="$(usex dropbox)" |
452 |
+ -DENABLE_GOOGLE_DRIVE="$(usex googledrive)" |
453 |
+ -DENABLE_LIBPULSE="$(usex pulseaudio)" |
454 |
+ -DENABLE_SKYDRIVE="$(usex skydrive)" |
455 |
+ -DENABLE_VK="$(usex vkontakte)" |
456 |
-DENABLE_SPOTIFY_BLOB=OFF |
457 |
- -DENABLE_BREAKPAD=OFF |
458 |
- #$(cmake-utils_use !system-sqlite STATIC_SQLITE) |
459 |
- #$(cmake-utils_use system-sqlite I_HATE_MY_USERS) |
460 |
- #$(cmake-utils_use system-sqlite MY_USERS_WILL_SUFFER_BECAUSE_OF_ME) |
461 |
+ -DENABLE_BREAKPAD=OFF #< disable crash reporting |
462 |
-DUSE_BUILTIN_TAGLIB=OFF |
463 |
-DUSE_SYSTEM_GMOCK=ON |
464 |
+ -DUSE_SYSTEM_PROJECTM=ON |
465 |
+ -DBUNDLE_PROJECTM_PRESETS=OFF |
466 |
+ # force to find crypto++ see bug #548544 |
467 |
+ -DCRYPTOPP_LIBRARIES="crypto++" |
468 |
+ -DCRYPTOPP_FOUND=ON |
469 |
) |
470 |
|
471 |
use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT |
472 |
@@ -148,7 +148,7 @@ src_configure() { |
473 |
|
474 |
src_test() { |
475 |
cd "${CMAKE_BUILD_DIR}" || die |
476 |
- Xemake test |
477 |
+ virtx emake test |
478 |
} |
479 |
|
480 |
pkg_preinst() { |
481 |
|
482 |
diff --git a/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch b/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch |
483 |
deleted file mode 100644 |
484 |
index 22a922b..0000000 |
485 |
--- a/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch |
486 |
+++ /dev/null |
487 |
@@ -1,32 +0,0 @@ |
488 |
---- Clementine-1.3rc1/CMakeLists.txt |
489 |
-+++ Clementine-1.3rc1/CMakeLists.txt |
490 |
-@@ -60,7 +60,7 @@ |
491 |
- |
492 |
- pkg_check_modules(CDIO libcdio) |
493 |
- pkg_check_modules(CHROMAPRINT REQUIRED libchromaprint) |
494 |
--pkg_search_module(CRYPTOPP cryptopp libcrypto++) |
495 |
-+#pkg_search_module(CRYPTOPP cryptopp libcrypto++) |
496 |
- pkg_check_modules(GIO gio-2.0) |
497 |
- pkg_check_modules(GLIB REQUIRED glib-2.0) |
498 |
- pkg_check_modules(GOBJECT REQUIRED gobject-2.0) |
499 |
-@@ -275,13 +275,14 @@ |
500 |
- |
501 |
- optional_component(VISUALISATIONS ON "Visualisations") |
502 |
- |
503 |
--if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND) |
504 |
-- message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify " |
505 |
-- "code must be compiled in") |
506 |
--elseif(CRYPTOPP_FOUND) |
507 |
-+#if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND) |
508 |
-+# message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify " |
509 |
-+# "code must be compiled in") |
510 |
-+#elseif(CRYPTOPP_FOUND) |
511 |
- set(HAVE_CRYPTOPP ON) |
512 |
-- set(HAVE_SPOTIFY_DOWNLOADER ON) |
513 |
--endif() |
514 |
-+ set(HAVE_SPOTIFY_DOWNLOADER OFF) |
515 |
-+ set(HAVE_SPOTIFY_BLOB OFF) |
516 |
-+#endif() |
517 |
- |
518 |
- # Find DBus if it's enabled |
519 |
- if (HAVE_DBUS) |
520 |
|
521 |
diff --git a/media-sound/clementine/metadata.xml b/media-sound/clementine/metadata.xml |
522 |
index eda2d27..64bd4a1 100644 |
523 |
--- a/media-sound/clementine/metadata.xml |
524 |
+++ b/media-sound/clementine/metadata.xml |
525 |
@@ -14,7 +14,8 @@ |
526 |
<name>Gentoo Sound project</name> |
527 |
</maintainer> |
528 |
<use> |
529 |
- <flag name="box">Enable Box support</flag> |
530 |
+ <flag name="amazoncloud">Enable Amazon cloud drive support</flag> |
531 |
+ <flag name="box">Enable filesharing via Box.com</flag> |
532 |
<flag name="dropbox">Enable Dropbox support</flag> |
533 |
<flag name="googledrive">Enable Google Drive support</flag> |
534 |
<flag name="lastfm">Use liblastfm for fetching song info, scrobbling and radio streams</flag> |
535 |
@@ -23,6 +24,7 @@ |
536 |
<flag name="skydrive">Enable Skydrive support</flag> |
537 |
<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg> installation</flag> |
538 |
<flag name="ubuntu-one">Enable Ubuntu One support</flag> |
539 |
+ <flag name="vkontakte">Enable vk.com support</flag> |
540 |
<flag name="wiimote">Enable support for Wii remote</flag> |
541 |
</use> |
542 |
<upstream> |