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

Gentoo Archives: gentoo-commits

From: "Cedric Krier (cedk)" <cedk@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/sndpeek/files: sndpeek-1.3-makefile.patch
Date: Sun, 30 Mar 2008 00:30:09
Message-Id: E1JflR1-00033b-1q@stork.gentoo.org
1 cedk 08/03/30 00:30:07
2
3 Added: sndpeek-1.3-makefile.patch
4 Log:
5 New ebuild for bug #142079
6 (Portage version: 2.1.4.4)
7
8 Revision Changes Path
9 1.1 media-sound/sndpeek/files/sndpeek-1.3-makefile.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/sndpeek/files/sndpeek-1.3-makefile.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/sndpeek/files/sndpeek-1.3-makefile.patch?rev=1.1&content-type=text/plain
13
14 Index: sndpeek-1.3-makefile.patch
15 ===================================================================
16 diff -ru sndpeek-1.3~/src/sndpeek/makefile.alsa sndpeek-1.3/src/sndpeek/makefile.alsa
17 --- sndpeek-1.3~/src/sndpeek/makefile.alsa 2007-08-12 19:22:00.000000000 +0200
18 +++ sndpeek-1.3/src/sndpeek/makefile.alsa 2007-08-12 19:27:57.000000000 +0200
19 @@ -1,10 +1,10 @@
20
21 -CC=gcc
22 -CPP=g++
23 +CC?=gcc
24 +CXX?=g++
25 INCLUDES=-I../marsyas/
26 MARSYAS_DIR=../marsyas/
27 -CFLAGS=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c
28 -LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile
29 +CFLAGS+=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ $(INCLUDES) -c
30 +LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile
31
32 OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \
33 Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o \
34 @@ -12,55 +12,55 @@
35 MagFFT.o NormRMS.o MarSignal.o fmatrix.o
36
37 sndpeek: $(OBJS)
38 - $(CPP) -o $@ $(OBJS) $(LIBS)
39 + $(CXX) -o $@ $(OBJS) $(LIBS)
40
41 Centroid.o:
42 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
43 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
44
45 DownSampler.o:
46 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
47 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
48
49 Flux.o:
50 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
51 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
52
53 LPC.o:
54 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
55 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
56
57 MFCC.o:
58 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
59 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
60
61 RMS.o:
62 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
63 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
64
65 Rolloff.o:
66 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
67 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
68
69 System.o:
70 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
71 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
72
73 fvec.o:
74 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
75 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
76
77 AutoCorrelation.o:
78 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
79 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
80
81 Communicator.o:
82 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
83 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
84
85 Hamming.o:
86 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
87 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
88
89 MagFFT.o:
90 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
91 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
92
93 NormRMS.o:
94 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
95 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
96
97 MarSignal.o:
98 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
99 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
100
101 fmatrix.o:
102 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
103 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
104
105 .o: $*.h
106
107 @@ -68,7 +68,7 @@
108 $(CC) $(CFLAGS) $*.c
109
110 .cpp.o: $*.h $*.cpp
111 - $(CC) $(CFLAGS) $*.cpp
112 + $(CXX) $(CFLAGS) $*.cpp
113
114 clean:
115 rm -f sndpeek *~ *.o
116 diff -ru sndpeek-1.3~/src/sndpeek/makefile.jack sndpeek-1.3/src/sndpeek/makefile.jack
117 --- sndpeek-1.3~/src/sndpeek/makefile.jack 2007-08-12 19:22:00.000000000 +0200
118 +++ sndpeek-1.3/src/sndpeek/makefile.jack 2007-08-12 19:31:29.000000000 +0200
119 @@ -1,9 +1,9 @@
120 -CC=gcc
121 -CPP=g++
122 +CC?=gcc
123 +CXX?=g++
124 INCLUDES=-I../marsyas/
125 MARSYAS_DIR=../marsyas/
126 -CFLAGS=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c
127 -LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -ljack -lXmu -lX11 -lXext -lXi -lm -lsndfile
128 +CFLAGS+=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ $(INCLUDES) -c
129 +LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -ljack -lXmu -lX12 -lXext -lXi -lm -lsndfile
130
131 OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \
132 Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o \
133 @@ -11,55 +11,55 @@
134 MagFFT.o NormRMS.o MarSignal.o fmatrix.o
135
136 sndpeek: $(OBJS)
137 - $(CPP) -o $@ $(OBJS) $(LIBS)
138 + $(CXX) -o $@ $(OBJS) $(LIBS)
139
140 Centroid.o:
141 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
142 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
143
144 DownSampler.o:
145 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
146 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
147
148 Flux.o:
149 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
150 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
151
152 LPC.o:
153 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
154 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
155
156 MFCC.o:
157 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
158 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
159
160 RMS.o:
161 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
162 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
163
164 Rolloff.o:
165 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
166 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
167
168 System.o:
169 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
170 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
171
172 fvec.o:
173 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
174 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
175
176 AutoCorrelation.o:
177 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
178 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
179
180 Communicator.o:
181 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
182 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
183
184 Hamming.o:
185 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
186 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
187
188 MagFFT.o:
189 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
190 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
191
192 NormRMS.o:
193 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
194 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
195
196 MarSignal.o:
197 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
198 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
199
200 fmatrix.o:
201 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
202 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
203
204 .o: $*.h
205
206 @@ -67,7 +67,7 @@
207 $(CC) $(CFLAGS) $*.c
208
209 .cpp.o: $*.h $*.cpp
210 - $(CC) $(CFLAGS) $*.cpp
211 + $(CXX) $(CFLAGS) $*.cpp
212
213 clean:
214 rm -f sndpeek *~ *.o
215 diff -ru sndpeek-1.3~/src/sndpeek/makefile.oss sndpeek-1.3/src/sndpeek/makefile.oss
216 --- sndpeek-1.3~/src/sndpeek/makefile.oss 2007-08-12 19:22:00.000000000 +0200
217 +++ sndpeek-1.3/src/sndpeek/makefile.oss 2007-08-12 19:33:28.000000000 +0200
218 @@ -1,8 +1,8 @@
219 -CC=gcc
220 -CPP=g++
221 +CC?=gcc
222 +CXX?=g++
223 INCLUDES=-I../marsyas/
224 MARSYAS_DIR=../marsyas/
225 -CFLAGS=-D__LINUX_OSS__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c
226 +CFLAGS+=-D__LINUX_OSS__ -D__LITTLE_ENDIAN__ $(INCLUDES) -c
227 LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lXmu -lX11 -lXext -lXi -lm -lsndfile
228
229 TARGE=sndpeek
230 @@ -12,55 +12,55 @@
231 MagFFT.o NormRMS.o MarSignal.o fmatrix.o
232
233 sndpeek: $(OBJS)
234 - $(CPP) -o $@ $(OBJS) $(LIBS)
235 + $(CXX) -o $@ $(OBJS) $(LIBS)
236
237 Centroid.o:
238 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
239 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
240
241 DownSampler.o:
242 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
243 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
244
245 Flux.o:
246 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
247 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
248
249 LPC.o:
250 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
251 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
252
253 MFCC.o:
254 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
255 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
256
257 RMS.o:
258 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
259 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
260
261 Rolloff.o:
262 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
263 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
264
265 System.o:
266 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
267 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
268
269 fvec.o:
270 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
271 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
272
273 AutoCorrelation.o:
274 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
275 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
276
277 Communicator.o:
278 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
279 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
280
281 Hamming.o:
282 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
283 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
284
285 MagFFT.o:
286 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
287 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
288
289 NormRMS.o:
290 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
291 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
292
293 MarSignal.o:
294 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
295 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
296
297 fmatrix.o:
298 - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
299 + $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
300
301 .o: $*.h
302
303 @@ -68,7 +68,7 @@
304 $(CC) $(CFLAGS) $*.c
305
306 .cpp.o: $*.h $*.cpp
307 - $(CC) $(CFLAGS) $*.cpp
308 + $(CXX) $(CFLAGS) $*.cpp
309
310 clean:
311 rm -f sndpeek *~ *.o
312
313
314
315 --
316 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups