Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/sndpeek/files/, media-sound/sndpeek/
Date: Sat, 08 Aug 2020 11:54:49
Message-Id: 1596887659.0491efeb3218f91c7b4e1301a98a2222c6767f0b.fordfrog@gentoo
1 commit: 0491efeb3218f91c7b4e1301a98a2222c6767f0b
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 8 11:54:19 2020 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 8 11:54:19 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0491efeb
7
8 media-sound/sndpeek: bump to 1.41 + removed 1.4
9
10 1) eapi7
11 2) virtual/jack + sorted deps
12
13 Closes: https://bugs.gentoo.org/736316
14 Package-Manager: Portage-3.0.1, Repoman-2.3.23
15 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
16
17 media-sound/sndpeek/Manifest | 2 +-
18 .../sndpeek/files/sndpeek-1.41-makefile.patch | 297 +++++++++++++++++++++
19 .../{sndpeek-1.4.ebuild => sndpeek-1.41.ebuild} | 29 +-
20 3 files changed, 314 insertions(+), 14 deletions(-)
21
22 diff --git a/media-sound/sndpeek/Manifest b/media-sound/sndpeek/Manifest
23 index 4fe9edd1bfa..9d6a8578b66 100644
24 --- a/media-sound/sndpeek/Manifest
25 +++ b/media-sound/sndpeek/Manifest
26 @@ -1 +1 @@
27 -DIST sndpeek-1.4.tgz 311174 BLAKE2B 8f75aa90e71c4b12e15da68774a357ecaab61dea64071b5276ea1fe5311c1e937350a8e46f6a8c4714a43f7174145881fa9be04c80c54ede351e0ece08de88ca SHA512 f44c2474828ccbd783d69cf14c5c63ab9c52e1f32fd3bdeb2b4e0c6c5dc83d5f88c2b4e27d48824b1acb29c730c1320953ccadf5635f61a9f93487bbcd821bcb
28 +DIST sndpeek-1.41.tgz 312196 BLAKE2B a86f9bca8930bb555614a19ae63d8336e8718aef2a9b1ad297b4a16282a37f6b7608e6cec889719915a0fccdf0e9b26d7c9703585f820599f121905a2e85f28a SHA512 b0d352332d80d89412cb9aa3507f1505e9c4bf29b327106ec758e71eb23db59395f41ecdbf5a55b3bcd4b1f6cf18766bdb294d78da9499717e65e48cff710465
29
30 diff --git a/media-sound/sndpeek/files/sndpeek-1.41-makefile.patch b/media-sound/sndpeek/files/sndpeek-1.41-makefile.patch
31 new file mode 100644
32 index 00000000000..4a1472f11da
33 --- /dev/null
34 +++ b/media-sound/sndpeek/files/sndpeek-1.41-makefile.patch
35 @@ -0,0 +1,297 @@
36 +diff --git a/src/sndpeek/makefile.alsa b/src/sndpeek/makefile.alsa
37 +index a0f76ba..1b7a21f 100644
38 +--- a/src/sndpeek/makefile.alsa
39 ++++ b/src/sndpeek/makefile.alsa
40 +@@ -1,10 +1,10 @@
41 +
42 +-CC=gcc
43 +-CPP=g++
44 ++CC?=gcc
45 ++CXX?=g++
46 + INCLUDES=-I../marsyas/
47 + MARSYAS_DIR=../marsyas/
48 +-CFLAGS=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -O3 -c
49 +-LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile
50 ++CFLAGS=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -c
51 ++LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile
52 +
53 + OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \
54 + Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o \
55 +@@ -12,55 +12,55 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \
56 + MagFFT.o NormRMS.o MarSignal.o fmatrix.o
57 +
58 + sndpeek: $(OBJS)
59 +- $(CPP) -o $@ $(OBJS) $(LIBS)
60 ++ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
61 +
62 + Centroid.o:
63 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
64 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
65 +
66 + DownSampler.o:
67 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
68 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
69 +
70 + Flux.o:
71 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
72 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
73 +
74 + LPC.o:
75 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
76 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
77 +
78 + MFCC.o:
79 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
80 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
81 +
82 + RMS.o:
83 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
84 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
85 +
86 + Rolloff.o:
87 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
88 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
89 +
90 + System.o:
91 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
92 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
93 +
94 + fvec.o:
95 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
96 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
97 +
98 + AutoCorrelation.o:
99 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
100 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
101 +
102 + Communicator.o:
103 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
104 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
105 +
106 + Hamming.o:
107 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
108 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
109 +
110 + MagFFT.o:
111 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
112 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
113 +
114 + NormRMS.o:
115 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
116 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
117 +
118 + MarSignal.o:
119 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
120 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
121 +
122 + fmatrix.o:
123 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
124 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
125 +
126 + .o: $*.h
127 +
128 +@@ -68,7 +68,7 @@ fmatrix.o:
129 + $(CC) $(CFLAGS) $*.c
130 +
131 + .cpp.o: $*.h $*.cpp
132 +- $(CC) $(CFLAGS) $*.cpp
133 ++ $(CXX) $(CFLAGS) $*.cpp
134 +
135 + clean:
136 + rm -f sndpeek *~ *.o
137 +diff --git a/src/sndpeek/makefile.jack b/src/sndpeek/makefile.jack
138 +index ec15276..86be1e7 100644
139 +--- a/src/sndpeek/makefile.jack
140 ++++ b/src/sndpeek/makefile.jack
141 +@@ -1,8 +1,8 @@
142 +-CC=gcc
143 +-CPP=g++
144 ++CC?=gcc
145 ++CXX?=g++
146 + INCLUDES=-I../marsyas/
147 + MARSYAS_DIR=../marsyas/
148 +-CFLAGS=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -O3 -c
149 ++CFLAGS=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -c
150 + LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -ljack -lXmu -lX11 -lXext -lXi -lm -lsndfile
151 +
152 + OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \
153 +@@ -11,55 +11,55 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \
154 + MagFFT.o NormRMS.o MarSignal.o fmatrix.o
155 +
156 + sndpeek: $(OBJS)
157 +- $(CPP) -o $@ $(OBJS) $(LIBS)
158 ++ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
159 +
160 + Centroid.o:
161 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
162 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
163 +
164 + DownSampler.o:
165 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
166 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
167 +
168 + Flux.o:
169 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
170 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
171 +
172 + LPC.o:
173 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
174 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
175 +
176 + MFCC.o:
177 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
178 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
179 +
180 + RMS.o:
181 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
182 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
183 +
184 + Rolloff.o:
185 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
186 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
187 +
188 + System.o:
189 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
190 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
191 +
192 + fvec.o:
193 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
194 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
195 +
196 + AutoCorrelation.o:
197 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
198 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
199 +
200 + Communicator.o:
201 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
202 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
203 +
204 + Hamming.o:
205 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
206 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
207 +
208 + MagFFT.o:
209 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
210 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
211 +
212 + NormRMS.o:
213 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
214 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
215 +
216 + MarSignal.o:
217 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
218 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
219 +
220 + fmatrix.o:
221 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
222 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
223 +
224 + .o: $*.h
225 +
226 +@@ -67,7 +67,7 @@ fmatrix.o:
227 + $(CC) $(CFLAGS) $*.c
228 +
229 + .cpp.o: $*.h $*.cpp
230 +- $(CC) $(CFLAGS) $*.cpp
231 ++ $(CXX) $(CFLAGS) $*.cpp
232 +
233 + clean:
234 + rm -f sndpeek *~ *.o
235 +diff --git a/src/sndpeek/makefile.oss b/src/sndpeek/makefile.oss
236 +index f092df2..d5768aa 100644
237 +--- a/src/sndpeek/makefile.oss
238 ++++ b/src/sndpeek/makefile.oss
239 +@@ -1,8 +1,8 @@
240 +-CC=gcc
241 +-CPP=g++
242 ++CC?=gcc
243 ++CXX?=g++
244 + INCLUDES=-I../marsyas/
245 + MARSYAS_DIR=../marsyas/
246 +-CFLAGS=-D__LINUX_OSS__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -O3 -c
247 ++CFLAGS=-D__LINUX_OSS__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -c
248 + LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lXmu -lX11 -lXext -lXi -lm -lsndfile
249 +
250 + TARGE=sndpeek
251 +@@ -12,55 +12,55 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \
252 + MagFFT.o NormRMS.o MarSignal.o fmatrix.o
253 +
254 + sndpeek: $(OBJS)
255 +- $(CPP) -o $@ $(OBJS) $(LIBS)
256 ++ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
257 +
258 + Centroid.o:
259 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
260 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
261 +
262 + DownSampler.o:
263 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
264 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
265 +
266 + Flux.o:
267 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
268 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
269 +
270 + LPC.o:
271 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
272 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
273 +
274 + MFCC.o:
275 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
276 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
277 +
278 + RMS.o:
279 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
280 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
281 +
282 + Rolloff.o:
283 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
284 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
285 +
286 + System.o:
287 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
288 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
289 +
290 + fvec.o:
291 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
292 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
293 +
294 + AutoCorrelation.o:
295 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
296 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
297 +
298 + Communicator.o:
299 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
300 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
301 +
302 + Hamming.o:
303 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
304 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
305 +
306 + MagFFT.o:
307 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
308 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
309 +
310 + NormRMS.o:
311 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
312 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
313 +
314 + MarSignal.o:
315 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
316 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
317 +
318 + fmatrix.o:
319 +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
320 ++ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
321 +
322 + .o: $*.h
323 +
324 +@@ -68,7 +68,7 @@ fmatrix.o:
325 + $(CC) $(CFLAGS) $*.c
326 +
327 + .cpp.o: $*.h $*.cpp
328 +- $(CC) $(CFLAGS) $*.cpp
329 ++ $(CXX) $(CFLAGS) $*.cpp
330 +
331 + clean:
332 + rm -f sndpeek *~ *.o
333
334 diff --git a/media-sound/sndpeek/sndpeek-1.4.ebuild b/media-sound/sndpeek/sndpeek-1.41.ebuild
335 similarity index 79%
336 rename from media-sound/sndpeek/sndpeek-1.4.ebuild
337 rename to media-sound/sndpeek/sndpeek-1.41.ebuild
338 index b60e397e0d7..ce8567bae37 100644
339 --- a/media-sound/sndpeek/sndpeek-1.4.ebuild
340 +++ b/media-sound/sndpeek/sndpeek-1.41.ebuild
341 @@ -1,7 +1,7 @@
342 -# Copyright 1999-2016 Gentoo Foundation
343 +# Copyright 1999-2020 Gentoo Authors
344 # Distributed under the terms of the GNU General Public License v2
345
346 -EAPI=5
347 +EAPI=7
348 inherit eutils toolchain-funcs
349
350 DESCRIPTION="real-time audio visualization"
351 @@ -13,24 +13,27 @@ SLOT="0"
352 KEYWORDS="~amd64 ~x86"
353 IUSE="+alsa jack oss"
354
355 -RDEPEND="media-libs/freeglut
356 - virtual/opengl
357 +RDEPEND="
358 + app-eselect/eselect-sndpeek
359 + media-libs/freeglut
360 virtual/glu
361 - x11-libs/libXmu
362 + virtual/opengl
363 x11-libs/libX11
364 x11-libs/libXext
365 + x11-libs/libXmu
366 media-libs/libsndfile
367 - jack? ( media-sound/jack-audio-connection-kit )
368 + jack? ( virtual/jack )
369 alsa? ( media-libs/alsa-lib )
370 - app-eselect/eselect-sndpeek"
371 +"
372 DEPEND="${RDEPEND}"
373 REQUIRED_USE="|| ( alsa jack oss )"
374
375 -src_prepare() {
376 - epatch "${FILESDIR}"/${PN}-1.3-makefile.patch \
377 - "${FILESDIR}"/${P}-gcc.patch \
378 - "${FILESDIR}"/${P}-ldflags.patch
379 -}
380 +DOCS=( AUTHORS README THANKS TODO VERSIONS )
381 +
382 +PATCHES=(
383 + "${FILESDIR}/${P}-makefile.patch"
384 +# "${FILESDIR}/${PN}-1.4-gcc.patch"
385 +)
386
387 compile_backend() {
388 backend=$1
389 @@ -53,7 +56,7 @@ src_install() {
390 use alsa && dobin src/sndpeek/sndpeek-alsa
391 use jack && dobin src/sndpeek/sndpeek-jack
392 use oss && dobin src/sndpeek/sndpeek-oss
393 - dodoc AUTHORS README THANKS TODO VERSIONS
394 + einstalldocs
395 }
396
397 pkg_postinst() {
Report Message
Find on MARC Find on Google Groups