1 |
commit: 2539602e02f8797712d44f12f5f5fd5871fa8b81 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 2 17:03:48 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 2 18:43:35 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2539602e |
7 |
|
8 |
media-sound/clementine: Drop 1.3.1_p20181112 snapshot |
9 |
|
10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
media-sound/clementine/Manifest | 1 - |
14 |
.../clementine/clementine-1.3.1_p20181112.ebuild | 182 --------------------- |
15 |
.../files/clementine-1.3.1_p20181112-no-dbus.patch | 41 ----- |
16 |
3 files changed, 224 deletions(-) |
17 |
|
18 |
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest |
19 |
index cd11a00b680..20346bcffb3 100644 |
20 |
--- a/media-sound/clementine/Manifest |
21 |
+++ b/media-sound/clementine/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 37412428cf030a71f0011ba68a7ce71a3bbdc59402dc6d6349cca8ee44b208052cee9add1597a9577e5a6ed4bb2ebf16c4e1f79612d12be265f637caffd02a76 SHA512 8f38554571c637d9f79df43679ac2a76383f7a9b4ee8e921a16175889180e72afadc352dd40d73a671aa8ae9b01f6a251ae7b94b010043f8bcb8d8f42dcfff62 |
24 |
-DIST clementine-1.3.1_p20181112.tar.gz 8526632 BLAKE2B da3f155006ef5e94233104011aadad41e974ec339827b91bd3c5c0c2420b23199be852a9d0cb7c9b0112ba2d43ff3e3e87388db92679f8e64da5c3fa3e578c1d SHA512 eed16cec7323b142e4602a4bd81d7363e9cf4fc203c3b8b341aadbe883fdbd571dff0792260eec8af2f91e79fe905c3510d1e7ce1b06e9d4698016820cc771fa |
25 |
DIST clementine-1.3.1_p20181201.tar.gz 8535075 BLAKE2B c4b6660ee9718054cc13c6b4fc2e1dccf9c117319f5b682dc5de2861fc40cc129e079449e1c2e15733faf14b6e18b42f37c228000a8e6c121b7fdcb2e48bc7b9 SHA512 fcc062857b95a5cabc41449143bb876df9955cdaaa59868f147d7a165dea13e2e4e1c11ea23f4309c8af7bef42d694a82867420245513af8e4dfbd91ab6f9a2c |
26 |
|
27 |
diff --git a/media-sound/clementine/clementine-1.3.1_p20181112.ebuild b/media-sound/clementine/clementine-1.3.1_p20181112.ebuild |
28 |
deleted file mode 100644 |
29 |
index 0840a685935..00000000000 |
30 |
--- a/media-sound/clementine/clementine-1.3.1_p20181112.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,182 +0,0 @@ |
33 |
-# Copyright 1999-2018 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=6 |
37 |
- |
38 |
-PLOCALES="af ar be bg bn br bs ca cs cy da de el en 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 mk_MK 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" |
39 |
- |
40 |
-MY_P="${P/_}" |
41 |
-if [[ ${PV} == *9999* ]]; then |
42 |
- EGIT_BRANCH="qt5" |
43 |
- EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" |
44 |
- GIT_ECLASS="git-r3" |
45 |
-else |
46 |
- COMMIT=b8eea8ccc116388b67e4b042a5b81e87bf7a24e5 |
47 |
- SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
48 |
- KEYWORDS="~amd64 ~x86" |
49 |
-fi |
50 |
-inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS} |
51 |
-unset GIT_ECLASS |
52 |
- |
53 |
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt" |
54 |
-HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine" |
55 |
- |
56 |
-LICENSE="GPL-3" |
57 |
-SLOT="0" |
58 |
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote" |
59 |
- |
60 |
-REQUIRED_USE=" |
61 |
- udisks? ( dbus ) |
62 |
- wiimote? ( dbus ) |
63 |
-" |
64 |
- |
65 |
-COMMON_DEPEND=" |
66 |
- app-crypt/qca:2[qt5(+)] |
67 |
- dev-db/sqlite:= |
68 |
- dev-libs/crypto++[asm] |
69 |
- dev-libs/glib:2 |
70 |
- dev-libs/libxml2 |
71 |
- dev-libs/protobuf:= |
72 |
- dev-qt/qtconcurrent:5 |
73 |
- dev-qt/qtcore:5 |
74 |
- dev-qt/qtgui:5 |
75 |
- dev-qt/qtnetwork:5[ssl] |
76 |
- dev-qt/qtsql:5[sqlite] |
77 |
- dev-qt/qtwidgets:5 |
78 |
- media-libs/chromaprint:= |
79 |
- media-libs/gstreamer:1.0 |
80 |
- media-libs/gst-plugins-base:1.0 |
81 |
- >=media-libs/libmygpo-qt-1.0.9[qt5(+)] |
82 |
- >=media-libs/taglib-1.11.1_p20181028 |
83 |
- sys-libs/zlib |
84 |
- virtual/glu |
85 |
- virtual/opengl |
86 |
- x11-libs/libX11 |
87 |
- cdda? ( dev-libs/libcdio:= ) |
88 |
- dbus? ( dev-qt/qtdbus:5 ) |
89 |
- ipod? ( >=media-libs/libgpod-0.8.0 ) |
90 |
- lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) |
91 |
- moodbar? ( sci-libs/fftw:3.0 ) |
92 |
- mtp? ( >=media-libs/libmtp-1.0.0 ) |
93 |
- projectm? ( |
94 |
- media-libs/glew:= |
95 |
- >=media-libs/libprojectm-1.2.0 |
96 |
- ) |
97 |
-" |
98 |
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; |
99 |
-# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches: |
100 |
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches |
101 |
-# Still possibly essential but not applied yet patches are: |
102 |
-# 06-fix-numeric-locale.patch |
103 |
-# 08-stdlib.h-for-rand.patch |
104 |
-RDEPEND="${COMMON_DEPEND} |
105 |
- media-plugins/gst-plugins-meta:1.0 |
106 |
- media-plugins/gst-plugins-soup:1.0 |
107 |
- media-plugins/gst-plugins-taglib:1.0 |
108 |
- mms? ( media-plugins/gst-plugins-libmms:1.0 ) |
109 |
- mtp? ( gnome-base/gvfs[mtp] ) |
110 |
- udisks? ( sys-fs/udisks:2 ) |
111 |
-" |
112 |
-DEPEND="${COMMON_DEPEND} |
113 |
- >=dev-cpp/gtest-1.8.0 |
114 |
- dev-libs/boost |
115 |
- dev-qt/linguist-tools:5 |
116 |
- dev-qt/qtopengl:5 |
117 |
- dev-qt/qtx11extras:5 |
118 |
- dev-qt/qtxml:5 |
119 |
- sys-devel/gettext |
120 |
- virtual/pkgconfig |
121 |
- box? ( dev-cpp/sparsehash ) |
122 |
- dropbox? ( dev-cpp/sparsehash ) |
123 |
- googledrive? ( dev-cpp/sparsehash ) |
124 |
- pulseaudio? ( media-sound/pulseaudio ) |
125 |
- seafile? ( dev-cpp/sparsehash ) |
126 |
- skydrive? ( dev-cpp/sparsehash ) |
127 |
- test? ( |
128 |
- dev-qt/qttest:5 |
129 |
- gnome-base/gsettings-desktop-schemas |
130 |
- ) |
131 |
-" |
132 |
- |
133 |
-RESTRICT="test" |
134 |
- |
135 |
-S="${WORKDIR}/${PN^}-${COMMIT}" |
136 |
- |
137 |
-DOCS=( Changelog README.md ) |
138 |
- |
139 |
-PATCHES=( "${FILESDIR}"/${P}-no-dbus.patch ) |
140 |
- |
141 |
-src_prepare() { |
142 |
- l10n_find_plocales_changes "src/translations" "" ".po" |
143 |
- |
144 |
- cmake-utils_src_prepare |
145 |
- # some tests fail or hang |
146 |
- sed -i \ |
147 |
- -e '/add_test_file(translations_test.cpp/d' \ |
148 |
- tests/CMakeLists.txt || die |
149 |
- |
150 |
- if ! use test; then |
151 |
- sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die |
152 |
- cmake_comment_add_subdirectory tests |
153 |
- fi |
154 |
- |
155 |
- rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die |
156 |
-} |
157 |
- |
158 |
-src_configure() { |
159 |
- # spotify is not in portage |
160 |
- local mycmakeargs=( |
161 |
- -DBUILD_WERROR=OFF |
162 |
- # force to find crypto++ see bug #548544 |
163 |
- -DCRYPTOPP_LIBRARIES="cryptopp" |
164 |
- -DCRYPTOPP_FOUND=ON |
165 |
- # avoid automagically enabling of ccache (bug #611010) |
166 |
- -DCCACHE_EXECUTABLE=OFF |
167 |
- -DENABLE_BREAKPAD=OFF #< disable crash reporting |
168 |
- -DENABLE_DEVICEKIT=OFF |
169 |
- -DENABLE_GIO=ON |
170 |
- -DENABLE_SPOTIFY_BLOB=OFF |
171 |
- -DUSE_SYSTEM_GMOCK=ON |
172 |
- -DUSE_SYSTEM_PROJECTM=ON |
173 |
- -DBUNDLE_PROJECTM_PRESETS=OFF |
174 |
- -DLINGUAS="$(l10n_get_locales)" |
175 |
- -DENABLE_BOX="$(usex box)" |
176 |
- -DENABLE_AUDIOCD="$(usex cdda)" |
177 |
- -DENABLE_DBUS="$(usex dbus)" |
178 |
- -DENABLE_DROPBOX="$(usex dropbox)" |
179 |
- -DENABLE_GOOGLE_DRIVE="$(usex googledrive)" |
180 |
- -DENABLE_LIBGPOD="$(usex ipod)" |
181 |
- -DENABLE_LIBLASTFM="$(usex lastfm)" |
182 |
- -DENABLE_MOODBAR="$(usex moodbar)" |
183 |
- -DENABLE_LIBMTP="$(usex mtp)" |
184 |
- -DENABLE_VISUALISATIONS="$(usex projectm)" |
185 |
- -DENABLE_SEAFILE="$(usex seafile)" |
186 |
- -DENABLE_SKYDRIVE="$(usex skydrive)" |
187 |
- -DENABLE_LIBPULSE="$(usex pulseaudio)" |
188 |
- -DENABLE_UDISKS2="$(usex udisks)" |
189 |
- -DENABLE_WIIMOTEDEV="$(usex wiimote)" |
190 |
- ) |
191 |
- |
192 |
- use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT |
193 |
- |
194 |
- cmake-utils_src_configure |
195 |
-} |
196 |
- |
197 |
-src_test() { |
198 |
- cd "${CMAKE_BUILD_DIR}" || die |
199 |
- virtx emake test |
200 |
-} |
201 |
- |
202 |
-pkg_postinst() { |
203 |
- xdg_desktop_database_update |
204 |
- gnome2_icon_cache_update |
205 |
- |
206 |
- elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta " |
207 |
- elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags " |
208 |
- elog "depending on your preferences" |
209 |
-} |
210 |
- |
211 |
-pkg_postrm() { |
212 |
- xdg_desktop_database_update |
213 |
- gnome2_icon_cache_update |
214 |
-} |
215 |
|
216 |
diff --git a/media-sound/clementine/files/clementine-1.3.1_p20181112-no-dbus.patch b/media-sound/clementine/files/clementine-1.3.1_p20181112-no-dbus.patch |
217 |
deleted file mode 100644 |
218 |
index d03db2451ad..00000000000 |
219 |
--- a/media-sound/clementine/files/clementine-1.3.1_p20181112-no-dbus.patch |
220 |
+++ /dev/null |
221 |
@@ -1,41 +0,0 @@ |
222 |
-From d940136d0ae2a98ea72d842df0099bebcd361426 Mon Sep 17 00:00:00 2001 |
223 |
-From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
224 |
-Date: Fri, 2 Nov 2018 12:58:08 +0100 |
225 |
-Subject: [PATCH] Fix build without Qt5DBus |
226 |
- |
227 |
---- |
228 |
- CMakeLists.txt | 2 +- |
229 |
- src/CMakeLists.txt | 4 ++++ |
230 |
- 2 files changed, 5 insertions(+), 1 deletion(-) |
231 |
- |
232 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
233 |
-index c1de26e3e..eaf794c27 100644 |
234 |
---- a/CMakeLists.txt |
235 |
-+++ b/CMakeLists.txt |
236 |
-@@ -304,7 +304,7 @@ endif () |
237 |
- if(WIN32) |
238 |
- set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Sql Qt5::Network Qt5::Xml Qt5::Widgets Qt5::Concurrent) |
239 |
- else(WIN32) |
240 |
-- set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Sql Qt5::Network Qt5::Xml Qt5::Widgets Qt5::Concurrent Qt5::X11Extras Qt5::DBus) |
241 |
-+ set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Sql Qt5::Network Qt5::Xml Qt5::Widgets Qt5::Concurrent Qt5::X11Extras) |
242 |
- endif(WIN32) |
243 |
- |
244 |
- # Remove GLU and GL from the link line - they're not really required |
245 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
246 |
-index 120f09949..88f1ac6c3 100644 |
247 |
---- a/src/CMakeLists.txt |
248 |
-+++ b/src/CMakeLists.txt |
249 |
-@@ -1249,6 +1249,10 @@ target_link_libraries(clementine_lib |
250 |
- Qocoa |
251 |
- ) |
252 |
- |
253 |
-+if (HAVE_DBUS) |
254 |
-+ target_link_libraries(clementine_lib Qt5::DBus) |
255 |
-+endif () |
256 |
-+ |
257 |
- if(ENABLE_VISUALISATIONS) |
258 |
- target_link_libraries(clementine_lib ${LIBPROJECTM_LIBRARIES}) |
259 |
- endif(ENABLE_VISUALISATIONS) |
260 |
--- |
261 |
-2.19.1 |
262 |
- |