Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/sonic-visualiser/files/, media-sound/sonic-visualiser/
Date: Sat, 31 Dec 2016 11:54:52
Message-Id: 1483184830.eb31b18fe8af27c440605f9496fc72c967f092dd.aballier@gentoo
1 commit: eb31b18fe8af27c440605f9496fc72c967f092dd
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 31 11:47:10 2016 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 31 11:47:10 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb31b18f
7
8 media-sound/sonic-visualiser: remove old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 media-sound/sonic-visualiser/Manifest | 3 -
13 .../files/sonic-visualiser-1.7.1-liboggz11.patch | 37 -------
14 .../files/sonic-visualiser-1.8-configure.patch | 11 ---
15 .../files/sonic-visualiser-1.8-gcc46.patch | 10 --
16 .../files/sonic-visualiser-1.9-gcc47.patch | 20 ----
17 .../sonic-visualiser/sonic-visualiser-1.9.ebuild | 92 ------------------
18 .../sonic-visualiser/sonic-visualiser-2.3.ebuild | 97 -------------------
19 .../sonic-visualiser/sonic-visualiser-2.4.1.ebuild | 106 ---------------------
20 8 files changed, 376 deletions(-)
21
22 diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
23 index 6fec4d5..6bc95a9 100644
24 --- a/media-sound/sonic-visualiser/Manifest
25 +++ b/media-sound/sonic-visualiser/Manifest
26 @@ -1,4 +1 @@
27 -DIST sonic-visualiser-1.9.tar.gz 1867608 SHA256 d899c219403d96c415809521ff71b7f326bf3c5015af496df7ae236de4712f02 SHA512 b626b1ddf59071b280b1da9d8733759784febefb5abcb7ac8fc9bfa1bd7beb45aa8f68e854122cddd6a85b393943c87671298759945ae1f771ccc4fbd9ba2a5e WHIRLPOOL c7e66421e133ec36ad26e7f44da6f1ed2b2378be5d33bb6f3a66f822a7b81422280053d4902e844d1c91dbcb8c4cb40a5000eb30e63bc8722c1c05d3fc94008d
28 -DIST sonic-visualiser-2.3.tar.gz 2909195 SHA256 0c90198d6974c8dfad7295498277f2ad8bd870b5e32d00e2aa22131bb3e006b8 SHA512 647b8e9a5e3547f7d8546318a63e68282ccec70a6710e90b97f5ddc1425038784f1f2da251dbae5db5b380737181de8e22561b33f4b86f7a6b4af336cdbdb7d3 WHIRLPOOL a7dd137f0d16bec5c462374932bd7e389f59fc19601bd2bd5e6872d4e5ce870f7414179e88bc3c13b46b42e10b06461d366146f09171a79531bece1db3303c89
29 -DIST sonic-visualiser-2.4.1.tar.gz 4155745 SHA256 cb57cefddd47bdb31130dbc6d6ed53dd1084cbcecf426f4df02bbf098e82d41a SHA512 9eb63ba8de670114d388e5faae6e8a16c732f05950324cee2c414d48cbe2e3a320b6876f4db578c01d08aa76de677ee295d5362160b03ab086eaba40c6f7f59f WHIRLPOOL 601764c75110545147620fe94e089bb0b71d874e7da1f7eb15ba01a39a541d80fa73605ea8d25c48d4d1db41b1eac92ec56e52bd557c7b2f41784274cc162ccd
30 DIST sonic-visualiser-2.5.tar.gz 4112133 SHA256 5a66f20bae002876c64bc26d79dcba4f4c96c3c71ae160b5aafb40cfeacecdbe SHA512 ec48456f5b089453ee9e8bdca5449da92b248a9278423b38a63dda4598b0496432337a152d8b296e8c5dcc2b434bc68c8d1dde225e398bf9bee1f4bbb6c8d7e6 WHIRLPOOL 0038c197a731e503c01d4f69b3b1aa6d347df95e84bc4ed75b7cd670bb50eeeb615e1ae9bfb357d6414fbc338fdfce6179635e8390cf835c37f7c5029767df9f
31
32 diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.7.1-liboggz11.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.7.1-liboggz11.patch
33 deleted file mode 100644
34 index 6f2842c..00000000
35 --- a/media-sound/sonic-visualiser/files/sonic-visualiser-1.7.1-liboggz11.patch
36 +++ /dev/null
37 @@ -1,37 +0,0 @@
38 -Index: sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.cpp
39 -===================================================================
40 ---- sonic-visualiser-1.7.1.orig/data/fileio/OggVorbisFileReader.cpp
41 -+++ sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.cpp
42 -@@ -138,15 +138,15 @@ OggVorbisFileReader::DecodeThread::run()
43 - }
44 -
45 - int
46 --OggVorbisFileReader::readPacket(OGGZ *, ogg_packet *packet, long, void *data)
47 -+OggVorbisFileReader::readPacket(OGGZ *, oggz_packet *packet, long, void *data)
48 - {
49 - OggVorbisFileReader *reader = (OggVorbisFileReader *)data;
50 - FishSound *fs = reader->m_fishSound;
51 -
52 -- fish_sound_prepare_truncation(fs, packet->granulepos, packet->e_o_s);
53 -- fish_sound_decode(fs, packet->packet, packet->bytes);
54 -+ fish_sound_prepare_truncation(fs, packet->op.granulepos, packet->op.e_o_s);
55 -+ fish_sound_decode(fs, packet->op.packet, packet->op.bytes);
56 -
57 -- reader->m_bytesRead += packet->bytes;
58 -+ reader->m_bytesRead += packet->op.bytes;
59 -
60 - // The number of bytes read by this function is smaller than
61 - // the file size because of the packet headers
62 -Index: sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.h
63 -===================================================================
64 ---- sonic-visualiser-1.7.1.orig/data/fileio/OggVorbisFileReader.h
65 -+++ sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.h
66 -@@ -82,7 +82,7 @@ protected:
67 - bool m_cancelled;
68 - int m_completion;
69 -
70 -- static int readPacket(OGGZ *, ogg_packet *, long, void *);
71 -+ static int readPacket(OGGZ *, oggz_packet *, long, void *);
72 - static int acceptFrames(FishSound *, float **, long, void *);
73 -
74 - class DecodeThread : public Thread
75
76 diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-configure.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-configure.patch
77 deleted file mode 100644
78 index 02752b7..00000000
79 --- a/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-configure.patch
80 +++ /dev/null
81 @@ -1,11 +0,0 @@
82 ---- sonic-visualiser-1.8/configure.orig
83 -+++ sonic-visualiser-1.8/configure
84 -@@ -18,7 +18,7 @@
85 - \$(MAKE) --directory=svgui
86 - sub-svapp:
87 - \$(MAKE) --directory=svapp
88 --sub-sonic-visualiser:
89 -+sub-sonic-visualiser: sub-svcore sub-svgui sub-svapp
90 - \$(MAKE) --directory=sonic-visualiser
91 - EOF
92 - echo " *** Generated Makefile"
93
94 diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-gcc46.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-gcc46.patch
95 deleted file mode 100644
96 index 47ff291..00000000
97 --- a/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-gcc46.patch
98 +++ /dev/null
99 @@ -1,10 +0,0 @@
100 ---- sonic-visualiser-1.8/svcore/base/ResizeableBitset.h.orig
101 -+++ sonic-visualiser-1.8/svcore/base/ResizeableBitset.h
102 -@@ -16,6 +16,7 @@
103 - #ifndef _RESIZEABLE_BITMAP_H_
104 - #define _RESIZEABLE_BITMAP_H_
105 -
106 -+#include <cstddef>
107 - #include <vector>
108 - #include <stdint.h>
109 -
110
111 diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch
112 deleted file mode 100644
113 index 19f9fb4..00000000
114 --- a/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch
115 +++ /dev/null
116 @@ -1,20 +0,0 @@
117 ---- sonic-visualiser-1.9/svcore/data/fileio/CodedAudioFileReader.cpp
118 -+++ sonic-visualiser-1.9/svcore/data/fileio/CodedAudioFileReader.cpp
119 -@@ -22,6 +22,7 @@
120 - #include "base/Serialiser.h"
121 - #include "base/Resampler.h"
122 -
123 -+#include <stdint.h>
124 - #include <iostream>
125 - #include <QDir>
126 - #include <QMutexLocker>
127 ---- sonic-visualiser-1.9/svcore/data/model/WritableWaveFileModel.cpp
128 -+++ sonic-visualiser-1.9/svcore/data/model/WritableWaveFileModel.cpp
129 -@@ -26,6 +26,7 @@
130 -
131 - #include <cassert>
132 - #include <iostream>
133 -+#include <stdint.h>
134 -
135 - //#define DEBUG_WRITABLE_WAVE_FILE_MODEL 1
136 -
137
138 diff --git a/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild
139 deleted file mode 100644
140 index 24f752a..00000000
141 --- a/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild
142 +++ /dev/null
143 @@ -1,92 +0,0 @@
144 -# Copyright 1999-2013 Gentoo Foundation
145 -# Distributed under the terms of the GNU General Public License v2
146 -# $Id$
147 -
148 -EAPI=4
149 -inherit eutils qt4-r2 autotools fdo-mime
150 -
151 -DESCRIPTION="Music audio files viewer and analiser"
152 -HOMEPAGE="http://www.sonicvisualiser.org/"
153 -SRC_URI="http://code.soundsoftware.ac.uk/attachments/download/194/${P}.tar.gz"
154 -
155 -LICENSE="GPL-2"
156 -SLOT="0"
157 -KEYWORDS="~amd64 ~x86"
158 -IUSE="fftw id3tag jack mad ogg osc +portaudio pulseaudio"
159 -
160 -RDEPEND="dev-qt/qtcore:4
161 - dev-qt/qtgui:4
162 - media-libs/libsndfile
163 - media-libs/libsamplerate
164 - fftw? ( sci-libs/fftw:3.0 )
165 - app-arch/bzip2
166 - >=media-libs/dssi-0.9.1
167 - media-libs/liblrdf
168 - dev-libs/redland
169 - media-libs/ladspa-sdk
170 - osc? ( media-libs/liblo )
171 - media-libs/speex
172 - >=media-libs/vamp-plugin-sdk-2.0
173 - media-libs/rubberband
174 - jack? ( media-sound/jack-audio-connection-kit )
175 - mad? ( media-libs/libmad )
176 - id3tag? ( media-libs/libid3tag )
177 - ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 )
178 - portaudio? ( >=media-libs/portaudio-19_pre20071207 )
179 - pulseaudio? ( media-sound/pulseaudio )"
180 -
181 -DEPEND="${RDEPEND}
182 - virtual/pkgconfig"
183 -
184 -REQUIRED_USE="|| ( jack pulseaudio portaudio )"
185 -
186 -sv_disable_opt() {
187 - einfo "Disabling $1"
188 - for i in sonic-visualiser svapp svcore svgui ; do
189 - sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
190 - done
191 -}
192 -
193 -src_prepare() {
194 - epatch "${FILESDIR}"/${PN}-1.8-configure.patch
195 - epatch "${FILESDIR}"/${PN}-1.9-gcc47.patch
196 - cd svcore
197 - epatch "${FILESDIR}"/${PN}-1.7.1-liboggz11.patch
198 -
199 - use fftw || sv_disable_opt fftw3f
200 - use fftw || sv_disable_opt fftw3
201 - use id3tag || sv_disable_opt id3tag
202 - use jack || sv_disable_opt jack
203 - use mad || sv_disable_opt mad
204 - use ogg || sv_disable_opt fishsound
205 - use ogg || sv_disable_opt oggz
206 - use osc || sv_disable_opt liblo
207 - use portaudio || sv_disable_opt portaudio
208 - use pulseaudio || sv_disable_opt libpulse
209 -
210 - for i in sonic-visualiser svapp svcore svgui ; do
211 - pushd "${S}"/$i > /dev/null
212 - eautoreconf
213 - popd > /dev/null
214 - done
215 -}
216 -
217 -src_install() {
218 - cd ${PN}
219 - dobin ${PN}
220 - dodoc README*
221 - #install samples
222 - insinto /usr/share/${PN}/samples
223 - doins samples/*
224 - # desktop entry
225 - doicon icons/sv-icon.svg
226 - domenu *.desktop
227 -}
228 -
229 -pkg_postinst() {
230 - fdo-mime_desktop_database_update
231 -}
232 -
233 -pkg_postrm() {
234 - fdo-mime_desktop_database_update
235 -}
236
237 diff --git a/media-sound/sonic-visualiser/sonic-visualiser-2.3.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-2.3.ebuild
238 deleted file mode 100644
239 index 29c3b81..00000000
240 --- a/media-sound/sonic-visualiser/sonic-visualiser-2.3.ebuild
241 +++ /dev/null
242 @@ -1,97 +0,0 @@
243 -# Copyright 1999-2015 Gentoo Foundation
244 -# Distributed under the terms of the GNU General Public License v2
245 -# $Id$
246 -
247 -EAPI=4
248 -inherit eutils qt4-r2 autotools fdo-mime
249 -
250 -DESCRIPTION="Music audio files viewer and analiser"
251 -HOMEPAGE="http://www.sonicvisualiser.org/"
252 -SRC_URI="http://code.soundsoftware.ac.uk/attachments/download/918/${P}.tar.gz"
253 -
254 -LICENSE="GPL-2"
255 -SLOT="0"
256 -KEYWORDS="~amd64 ~x86"
257 -IUSE="id3tag jack mad ogg osc +portaudio pulseaudio"
258 -
259 -RDEPEND="dev-qt/qtcore:4
260 - dev-qt/qtgui:4
261 - dev-qt/qttest:4
262 - media-libs/libsndfile
263 - media-libs/libsamplerate
264 - app-arch/bzip2
265 - >=media-libs/dssi-0.9.1
266 - media-libs/liblrdf
267 - media-libs/ladspa-sdk
268 - media-libs/speex
269 - >=media-libs/vamp-plugin-sdk-2.0
270 - media-libs/rubberband
271 - dev-libs/sord
272 - dev-libs/serd
273 - sci-libs/fftw:3.0
274 - osc? ( media-libs/liblo )
275 - portaudio? ( >=media-libs/portaudio-19_pre20071207 )
276 - jack? ( media-sound/jack-audio-connection-kit )
277 - mad? ( media-libs/libmad )
278 - id3tag? ( media-libs/libid3tag )
279 - ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 )
280 - pulseaudio? ( media-sound/pulseaudio )"
281 -
282 -DEPEND="${RDEPEND}
283 - virtual/pkgconfig"
284 -
285 -REQUIRED_USE="|| ( jack pulseaudio portaudio )"
286 -
287 -sv_disable_opt() {
288 - einfo "Disabling $1"
289 - for i in . svapp svcore svgui ; do
290 - sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
291 - done
292 -}
293 -
294 -src_prepare() {
295 - use id3tag || sv_disable_opt id3tag
296 - use jack || sv_disable_opt jack
297 - use mad || sv_disable_opt mad
298 - use ogg || sv_disable_opt fishsound
299 - use ogg || sv_disable_opt oggz
300 - use osc || sv_disable_opt liblo
301 - use portaudio || sv_disable_opt portaudio
302 - use pulseaudio || sv_disable_opt libpulse
303 -
304 - eautoreconf
305 -}
306 -
307 -src_configure() {
308 - econf
309 - eqmake4
310 -}
311 -
312 -src_compile() {
313 - # de parallelize a bit otherwise it fails...
314 - emake sub-dataquay-lib-pro
315 - emake sub-svcore
316 - emake sub-svgui
317 - emake sub-svapp
318 - emake
319 -}
320 -
321 -src_install() {
322 - cd ${PN}
323 - dobin ${PN}
324 - dodoc README*
325 - #install samples
326 - insinto /usr/share/${PN}/samples
327 - doins samples/*
328 - # desktop entry
329 - doicon icons/sv-icon.svg
330 - domenu *.desktop
331 -}
332 -
333 -pkg_postinst() {
334 - fdo-mime_desktop_database_update
335 -}
336 -
337 -pkg_postrm() {
338 - fdo-mime_desktop_database_update
339 -}
340
341 diff --git a/media-sound/sonic-visualiser/sonic-visualiser-2.4.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-2.4.1.ebuild
342 deleted file mode 100644
343 index 0584fdc..00000000
344 --- a/media-sound/sonic-visualiser/sonic-visualiser-2.4.1.ebuild
345 +++ /dev/null
346 @@ -1,106 +0,0 @@
347 -# Copyright 1999-2015 Gentoo Foundation
348 -# Distributed under the terms of the GNU General Public License v2
349 -# $Id$
350 -
351 -EAPI=4
352 -inherit eutils qmake-utils autotools fdo-mime
353 -
354 -DESCRIPTION="Music audio files viewer and analiser"
355 -HOMEPAGE="http://www.sonicvisualiser.org/"
356 -SRC_URI="http://code.soundsoftware.ac.uk/attachments/download/1185/${P}.tar.gz"
357 -
358 -LICENSE="GPL-2"
359 -SLOT="0"
360 -KEYWORDS="~amd64 ~x86"
361 -IUSE="id3tag jack mad ogg osc +portaudio pulseaudio"
362 -
363 -RDEPEND="dev-qt/qtcore:5
364 - dev-qt/qtgui:5
365 - dev-qt/qtxml:5
366 - dev-qt/qtwidgets:5
367 - dev-qt/qtnetwork:5
368 - dev-qt/qttest:5
369 - media-libs/libsndfile
370 - media-libs/libsamplerate
371 - app-arch/bzip2
372 - >=media-libs/dssi-0.9.1
373 - media-libs/liblrdf
374 - media-libs/ladspa-sdk
375 - media-libs/speex
376 - >=media-libs/vamp-plugin-sdk-2.0
377 - media-libs/rubberband
378 - dev-libs/sord
379 - dev-libs/serd
380 - sci-libs/fftw:3.0
381 - osc? ( media-libs/liblo )
382 - portaudio? ( >=media-libs/portaudio-19_pre20071207 )
383 - jack? ( media-sound/jack-audio-connection-kit )
384 - mad? ( media-libs/libmad )
385 - id3tag? ( media-libs/libid3tag )
386 - ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 )
387 - pulseaudio? ( media-sound/pulseaudio )"
388 -
389 -DEPEND="${RDEPEND}
390 - virtual/pkgconfig"
391 -
392 -REQUIRED_USE="|| ( jack pulseaudio portaudio )"
393 -
394 -sv_disable_opt() {
395 - einfo "Disabling $1"
396 - for i in . svapp svcore svgui ; do
397 - sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
398 - done
399 -}
400 -
401 -src_prepare() {
402 - use id3tag || sv_disable_opt id3tag
403 - use jack || sv_disable_opt jack
404 - use mad || sv_disable_opt mad
405 - use ogg || sv_disable_opt fishsound
406 - use ogg || sv_disable_opt oggz
407 - use osc || sv_disable_opt liblo
408 - use portaudio || sv_disable_opt portaudio
409 - use pulseaudio || sv_disable_opt libpulse
410 -
411 - eautoreconf
412 -}
413 -
414 -src_configure() {
415 - export QMAKE="$(qt5_get_bindir)"/qmake
416 - econf
417 - eqmake5 -r sonic-visualiser.pro
418 -}
419 -
420 -src_compile() {
421 - # de parallelize a bit otherwise it fails...
422 - emake sub-dataquay-lib-pro
423 - emake sub-svcore
424 - emake sub-svgui
425 - emake sub-svapp
426 - emake sub-sv-pro
427 -}
428 -
429 -src_test() {
430 - emake sub-svcore-base-test
431 - emake sub-svcore-data-fileio-test
432 -}
433 -
434 -src_install() {
435 - cd ${PN}
436 - dobin ${PN}
437 - dodoc README*
438 - #install samples
439 - insinto /usr/share/${PN}/samples
440 - doins samples/*
441 - # desktop entry
442 - doicon icons/sv-icon.svg
443 - domenu *.desktop
444 -}
445 -
446 -pkg_postinst() {
447 - fdo-mime_desktop_database_update
448 -}
449 -
450 -pkg_postrm() {
451 - fdo-mime_desktop_database_update
452 -}