1 |
commit: 64a65ff4896ce418615b4f372d266922a19f7c5c |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 14 22:59:49 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 14 23:06:33 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64a65ff4 |
7 |
|
8 |
media-plugins/audacious-plugins: Drop 3.10-r1 |
9 |
|
10 |
Package-Manager: Portage-2.3.60, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
media-plugins/audacious-plugins/Manifest | 1 - |
14 |
.../audacious-plugins-3.10-r1.ebuild | 170 --------------------- |
15 |
.../audacious-plugins-3.10.1.ebuild | 2 +- |
16 |
.../audacious-plugins-9999.ebuild | 2 +- |
17 |
.../audacious-plugins-3.10-fix-slow-search.patch | 108 ------------- |
18 |
5 files changed, 2 insertions(+), 281 deletions(-) |
19 |
|
20 |
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest |
21 |
index d8188f36726..4be89181fe8 100644 |
22 |
--- a/media-plugins/audacious-plugins/Manifest |
23 |
+++ b/media-plugins/audacious-plugins/Manifest |
24 |
@@ -1,3 +1,2 @@ |
25 |
DIST audacious-plugins-3.10.1.tar.bz2 1715477 BLAKE2B fda3940e6c06aadd93a3e1538be747083fcc969cf3118cf3e942787906b9ee0a13bd3c30d15ba19cb713559cdf8f7b71d7b961173b1619f0aafbdea5deb75ac3 SHA512 454e9ce4061e92a0ecda40f562d4cc7453fc0019fd76b25dbe9e319319fa37c22f9785cb29563e8074de8a88e6130106aca1e431790297e1b4636dc974fde565 |
26 |
-DIST audacious-plugins-3.10.tar.bz2 1701877 BLAKE2B 4db7351af494ff5b7d2a7968524e2480f321505759f4a6532dd86f8fd87f43ab0a66e9f1fc75cfcbc8c59d35c1071048b61a8452fa6e041cd1667872f5b5699e SHA512 88dd93b5a7f6582ec42cf539d1000de0900cce683f4de85d8a17f57c7ba34545c6277882cad1505cb6682ee7b885ffcd1fe5675f7e24dc3e2a650615789d9d52 |
27 |
DIST audacious-plugins-3.9-gtk3.tar.bz2 1842950 BLAKE2B 55f373be204a9b4c9cff41d41d43c4776f680ab203643e90e5d338bec2e7f8a4c60cda9caa08e461089a475f3ec1bc237538f781718eb0d26a4365743337e977 SHA512 e2529af761bc97e589cac08689b16db657096b1bbfcc802789726ae1b472746025bec1b492de52eef755d7b50574d09b9250761bf701b1ca37f8a0e8db0f207b |
28 |
|
29 |
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10-r1.ebuild |
30 |
deleted file mode 100644 |
31 |
index 2866dd8fcd2..00000000000 |
32 |
--- a/media-plugins/audacious-plugins/audacious-plugins-3.10-r1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,170 +0,0 @@ |
35 |
-# Copyright 1999-2018 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
- |
40 |
-MY_P="${P/_/-}" |
41 |
- |
42 |
-if [[ ${PV} == *9999 ]]; then |
43 |
- inherit autotools git-r3 |
44 |
- EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git" |
45 |
-else |
46 |
- SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2" |
47 |
- KEYWORDS="~amd64 ~x86" |
48 |
-fi |
49 |
-DESCRIPTION="Lightweight and versatile audio player" |
50 |
-HOMEPAGE="https://audacious-media-player.org/" |
51 |
- |
52 |
-LICENSE="GPL-2" |
53 |
-SLOT="0" |
54 |
-IUSE="aac adplug +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libav libnotify libsamplerate |
55 |
- lirc mms modplug mp3 nls opengl pulseaudio qt5 qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack" |
56 |
-REQUIRED_USE=" |
57 |
- || ( alsa jack pulseaudio qtmedia sdl ) |
58 |
- ampache? ( qt5 http ) qtmedia? ( qt5 )" |
59 |
- |
60 |
-# The following plugins REQUIRE a GUI build of audacious, because non-GUI |
61 |
-# builds do NOT install the libaudgui library & headers. |
62 |
-# Plugins without a configure option: |
63 |
-# alarm |
64 |
-# albumart |
65 |
-# delete-files |
66 |
-# ladspa |
67 |
-# playlist-manager |
68 |
-# search-tool |
69 |
-# skins |
70 |
-# vtx |
71 |
-# Plugins with a configure option: |
72 |
-# glspectrum |
73 |
-# gtkui |
74 |
-# hotkey |
75 |
-# notify |
76 |
-# statusicon |
77 |
-RDEPEND=" |
78 |
- app-arch/unzip |
79 |
- dev-libs/dbus-glib |
80 |
- dev-libs/glib |
81 |
- dev-libs/libxml2:2 |
82 |
- ~media-sound/audacious-${PV}[qt5=] |
83 |
- aac? ( >=media-libs/faad2-2.7 ) |
84 |
- adplug? ( media-libs/adplug ) |
85 |
- alsa? ( >=media-libs/alsa-lib-1.0.16 ) |
86 |
- ampache? ( =media-libs/ampache_browser-1* ) |
87 |
- bs2b? ( media-libs/libbs2b ) |
88 |
- cdda? ( |
89 |
- dev-libs/libcdio:= |
90 |
- dev-libs/libcdio-paranoia |
91 |
- >=media-libs/libcddb-1.2.1 |
92 |
- ) |
93 |
- cue? ( media-libs/libcue ) |
94 |
- ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) |
95 |
- flac? ( |
96 |
- >=media-libs/flac-1.2.1-r1 |
97 |
- >=media-libs/libvorbis-1.0 |
98 |
- ) |
99 |
- fluidsynth? ( media-sound/fluidsynth ) |
100 |
- http? ( >=net-libs/neon-0.26.4 ) |
101 |
- jack? ( |
102 |
- >=media-libs/bio2jack-0.4 |
103 |
- virtual/jack |
104 |
- ) |
105 |
- lame? ( media-sound/lame ) |
106 |
- libnotify? ( x11-libs/libnotify ) |
107 |
- libsamplerate? ( media-libs/libsamplerate:= ) |
108 |
- lirc? ( app-misc/lirc ) |
109 |
- mms? ( >=media-libs/libmms-0.3 ) |
110 |
- modplug? ( media-libs/libmodplug ) |
111 |
- mp3? ( >=media-sound/mpg123-1.12.1 ) |
112 |
- pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) |
113 |
- !qt5? ( |
114 |
- x11-libs/gtk+:2 |
115 |
- x11-libs/libXcomposite |
116 |
- x11-libs/libXrender |
117 |
- ) |
118 |
- qt5? ( |
119 |
- dev-qt/qtcore:5 |
120 |
- dev-qt/qtgui:5 |
121 |
- dev-qt/qtwidgets:5 |
122 |
- opengl? ( dev-qt/qtopengl:5 ) |
123 |
- ) |
124 |
- qtmedia? ( dev-qt/qtmultimedia:5 ) |
125 |
- scrobbler? ( net-misc/curl ) |
126 |
- sdl? ( media-libs/libsdl2[sound] ) |
127 |
- sid? ( >=media-libs/libsidplayfp-1.0.0 ) |
128 |
- sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) |
129 |
- soxr? ( media-libs/soxr ) |
130 |
- speedpitch? ( media-libs/libsamplerate:= ) |
131 |
- vorbis? ( |
132 |
- >=media-libs/libogg-1.1.3 |
133 |
- >=media-libs/libvorbis-1.2.0 |
134 |
- ) |
135 |
- wavpack? ( >=media-sound/wavpack-4.50.1-r1 ) |
136 |
-" |
137 |
-DEPEND="${RDEPEND} |
138 |
- dev-util/gdbus-codegen |
139 |
- virtual/pkgconfig |
140 |
- nls? ( dev-util/intltool ) |
141 |
-" |
142 |
- |
143 |
-PATCHES=( "${FILESDIR}/${P}-fix-slow-search.patch" ) |
144 |
- |
145 |
-S="${WORKDIR}/${MY_P}" |
146 |
- |
147 |
-src_prepare() { |
148 |
- default |
149 |
- if ! use nls; then |
150 |
- sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698 |
151 |
- fi |
152 |
- [[ ${PV} == *9999 ]] && eautoreconf |
153 |
-} |
154 |
- |
155 |
-src_configure() { |
156 |
- use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag" |
157 |
- |
158 |
- local myeconfargs=( |
159 |
- --enable-mpris2 |
160 |
- --enable-songchange |
161 |
- --disable-oss4 |
162 |
- --disable-coreaudio |
163 |
- --disable-sndio |
164 |
- $(use_enable aac) |
165 |
- $(use_enable adplug) |
166 |
- $(use_enable alsa) |
167 |
- $(use_enable ampache) |
168 |
- $(use_enable bs2b) |
169 |
- $(use_enable cdda cdaudio) |
170 |
- $(use_enable cue) |
171 |
- $(use_enable flac) |
172 |
- $(use_enable flac filewriter) |
173 |
- $(use_enable fluidsynth amidiplug) |
174 |
- $(use_enable gme console) |
175 |
- $(use_enable http neon) |
176 |
- $(use_enable jack) |
177 |
- $(use_enable lame filewriter_mp3) |
178 |
- $(use_enable libnotify notify) |
179 |
- $(use_enable libsamplerate resample) |
180 |
- $(use_enable lirc) |
181 |
- $(use_enable mms) |
182 |
- $(use_enable modplug) |
183 |
- $(use_enable mp3 mpg123) |
184 |
- $(use_enable nls) |
185 |
- $(use_enable pulseaudio pulse) |
186 |
- $(use_enable !qt5 aosd) |
187 |
- $(use_enable !qt5 gtk) |
188 |
- $(use_enable !qt5 hotkey) |
189 |
- $(use_enable qt5 qt) |
190 |
- $(use_enable qtmedia qtaudio) |
191 |
- $(use_enable scrobbler scrobbler2) |
192 |
- $(use_enable sdl sdlout) |
193 |
- $(use_enable sid) |
194 |
- $(use_enable sndfile) |
195 |
- $(use_enable soxr) |
196 |
- $(use_enable speedpitch) |
197 |
- $(use_enable vorbis) |
198 |
- $(use_enable wavpack) |
199 |
- $(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg)) |
200 |
- ) |
201 |
- use qt5 && myeconfargs+=( $(usex opengl --enable-qtglspectrum --disable-qtglspectrum) ) |
202 |
- |
203 |
- econf "${myeconfargs[@]}" |
204 |
-} |
205 |
|
206 |
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10.1.ebuild |
207 |
index 2cd7781d94f..2b461d2a057 100644 |
208 |
--- a/media-plugins/audacious-plugins/audacious-plugins-3.10.1.ebuild |
209 |
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.10.1.ebuild |
210 |
@@ -45,7 +45,7 @@ BDEPEND=" |
211 |
virtual/pkgconfig |
212 |
nls? ( dev-util/intltool ) |
213 |
" |
214 |
-RDEPEND=" |
215 |
+DEPEND=" |
216 |
app-arch/unzip |
217 |
dev-libs/dbus-glib |
218 |
dev-libs/glib |
219 |
|
220 |
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild |
221 |
index 2cd7781d94f..2b461d2a057 100644 |
222 |
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild |
223 |
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild |
224 |
@@ -45,7 +45,7 @@ BDEPEND=" |
225 |
virtual/pkgconfig |
226 |
nls? ( dev-util/intltool ) |
227 |
" |
228 |
-RDEPEND=" |
229 |
+DEPEND=" |
230 |
app-arch/unzip |
231 |
dev-libs/dbus-glib |
232 |
dev-libs/glib |
233 |
|
234 |
diff --git a/media-plugins/audacious-plugins/files/audacious-plugins-3.10-fix-slow-search.patch b/media-plugins/audacious-plugins/files/audacious-plugins-3.10-fix-slow-search.patch |
235 |
deleted file mode 100644 |
236 |
index 3012d313873..00000000000 |
237 |
--- a/media-plugins/audacious-plugins/files/audacious-plugins-3.10-fix-slow-search.patch |
238 |
+++ /dev/null |
239 |
@@ -1,108 +0,0 @@ |
240 |
-From 9d162207ef01c5972e4bb718d390c494f0ad0241 Mon Sep 17 00:00:00 2001 |
241 |
-From: John Lindgren <john@×××××××××.net> |
242 |
-Date: Tue, 4 Sep 2018 23:39:00 -0400 |
243 |
-Subject: [PATCH] qtui: Fix slow searching on large playlists. Closes: #819. |
244 |
- |
245 |
---- |
246 |
- src/qtui/playlist-qt.cc | 58 +++++++++++++++++++++++++++++------------ |
247 |
- src/qtui/playlist-qt.h | 1 + |
248 |
- 2 files changed, 42 insertions(+), 17 deletions(-) |
249 |
- |
250 |
-diff --git a/src/qtui/playlist-qt.cc b/src/qtui/playlist-qt.cc |
251 |
-index 28c480ead..750d87c37 100644 |
252 |
---- a/src/qtui/playlist-qt.cc |
253 |
-+++ b/src/qtui/playlist-qt.cc |
254 |
-@@ -89,6 +89,31 @@ int PlaylistWidget::indexToRow (const QModelIndex & index) |
255 |
- return proxyModel->mapToSource (index).row (); |
256 |
- } |
257 |
- |
258 |
-+QModelIndex PlaylistWidget::visibleIndexNear (int row) |
259 |
-+{ |
260 |
-+ QModelIndex index = rowToIndex (row); |
261 |
-+ if (index.isValid ()) |
262 |
-+ return index; |
263 |
-+ |
264 |
-+ int n_entries = m_playlist.n_entries (); |
265 |
-+ |
266 |
-+ for (int r = row + 1; r < n_entries; r ++) |
267 |
-+ { |
268 |
-+ index = rowToIndex (r); |
269 |
-+ if (index.isValid ()) |
270 |
-+ return index; |
271 |
-+ } |
272 |
-+ |
273 |
-+ for (int r = row - 1; r >= 0; r --) |
274 |
-+ { |
275 |
-+ index = rowToIndex (r); |
276 |
-+ if (index.isValid ()) |
277 |
-+ return index; |
278 |
-+ } |
279 |
-+ |
280 |
-+ return index; |
281 |
-+} |
282 |
-+ |
283 |
- void PlaylistWidget::contextMenuEvent (QContextMenuEvent * event) |
284 |
- { |
285 |
- if (contextMenu) |
286 |
-@@ -379,33 +404,32 @@ void PlaylistWidget::playCurrentIndex () |
287 |
- |
288 |
- void PlaylistWidget::setFilter (const char * text) |
289 |
- { |
290 |
-+ // Save the current focus before filtering |
291 |
-+ int focus = m_playlist.get_focus (); |
292 |
-+ |
293 |
-+ // Empty the model before updating the filter. This prevents Qt from |
294 |
-+ // performing a series of "rows added" or "rows deleted" updates, which can |
295 |
-+ // be very slow (worst case O(N^2) complexity) on a large playlist. |
296 |
-+ model->entriesRemoved (0, model->rowCount ()); |
297 |
-+ |
298 |
-+ // Update the filter |
299 |
- proxyModel->setFilter (text); |
300 |
- |
301 |
-- int focus = m_playlist.get_focus (); |
302 |
-- QModelIndex index; |
303 |
-+ // Repopulate the model |
304 |
-+ model->entriesAdded (0, m_playlist.n_entries ()); |
305 |
- |
306 |
-- // If there was a valid focus before filtering, Qt updates it for us via |
307 |
-- // currentChanged(). If not, we will set focus on the first visible row. |
308 |
-+ // If the previously focused row is no longer visible with the new filter, |
309 |
-+ // try to find a nearby one that is, and focus it. |
310 |
-+ auto index = visibleIndexNear (focus); |
311 |
- |
312 |
-- if (focus >= 0) |
313 |
-- index = rowToIndex (focus); |
314 |
-- else |
315 |
-+ if (index.isValid ()) |
316 |
- { |
317 |
-- if (! proxyModel->rowCount ()) |
318 |
-- return; |
319 |
-- |
320 |
-- index = proxyModel->index (0, 0); |
321 |
- focus = indexToRow (index); |
322 |
- m_playlist.set_focus (focus); |
323 |
-- } |
324 |
-- |
325 |
-- if (! m_playlist.entry_selected (focus)) |
326 |
-- { |
327 |
- m_playlist.select_all (false); |
328 |
- m_playlist.select_entry (focus, true); |
329 |
-+ scrollTo (index); |
330 |
- } |
331 |
-- |
332 |
-- scrollTo (index); |
333 |
- } |
334 |
- |
335 |
- void PlaylistWidget::setFirstVisibleColumn (int col) |
336 |
-diff --git a/src/qtui/playlist-qt.h b/src/qtui/playlist-qt.h |
337 |
-index a2894323c..df44205af 100644 |
338 |
---- a/src/qtui/playlist-qt.h |
339 |
-+++ b/src/qtui/playlist-qt.h |
340 |
-@@ -66,6 +66,7 @@ class PlaylistWidget : public QTreeView |
341 |
- |
342 |
- QModelIndex rowToIndex (int row); |
343 |
- int indexToRow (const QModelIndex & index); |
344 |
-+ QModelIndex visibleIndexNear (int row); |
345 |
- |
346 |
- void getSelectedRanges (int rowsBefore, int rowsAfter, |
347 |
- QItemSelection & selected, QItemSelection & deselected); |