Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/ardour/files: ardour-2.4-gcc43.patch
Date: Sun, 20 Apr 2008 16:54:50
Message-Id: E1JncoQ-0006lV-Rm@stork.gentoo.org
1 aballier 08/04/20 16:54:46
2
3 Added: ardour-2.4-gcc43.patch
4 Log:
5 Fix build with gcc 4.3, by jwrdegoede, reported by David Carlos Manuelda <StormByte@×××××.com>, bug #217307
6 (Portage version: 2.1.5_rc5)
7
8 Revision Changes Path
9 1.1 media-sound/ardour/files/ardour-2.4-gcc43.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/ardour/files/ardour-2.4-gcc43.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/ardour/files/ardour-2.4-gcc43.patch?rev=1.1&content-type=text/plain
13
14 Index: ardour-2.4-gcc43.patch
15 ===================================================================
16 http://tracker.ardour.org/view.php?id=2181
17
18 diff -up ardour-2.4/gtk2_ardour/actions.cc.gcc43 ardour-2.4/gtk2_ardour/actions.cc
19 --- ardour-2.4/gtk2_ardour/actions.cc.gcc43 2008-03-31 08:07:53.000000000 -0400
20 +++ ardour-2.4/gtk2_ardour/actions.cc 2008-04-05 15:29:00.000000000 -0400
21 @@ -17,6 +17,7 @@
22
23 */
24
25 +#include <cstring>
26 #include <vector>
27 #include <string>
28 #include <list>
29 diff -up ardour-2.4/gtk2_ardour/editing.cc.gcc43 ardour-2.4/gtk2_ardour/editing.cc
30 --- ardour-2.4/gtk2_ardour/editing.cc.gcc43 2008-04-05 15:34:10.000000000 -0400
31 +++ ardour-2.4/gtk2_ardour/editing.cc 2008-04-05 15:34:21.000000000 -0400
32 @@ -17,7 +17,7 @@
33
34 */
35
36 -#include <string>
37 +#include <cstring>
38
39 #include "editing.h"
40
41 diff -up ardour-2.4/gtk2_ardour/editing_syms.h.gcc43 ardour-2.4/gtk2_ardour/editing_syms.h
42 diff -up ardour-2.4/gtk2_ardour/fft_result.cc.gcc43 ardour-2.4/gtk2_ardour/fft_result.cc
43 --- ardour-2.4/gtk2_ardour/fft_result.cc.gcc43 2008-04-05 16:47:41.000000000 -0400
44 +++ ardour-2.4/gtk2_ardour/fft_result.cc 2008-04-05 16:53:14.000000000 -0400
45 @@ -21,6 +21,7 @@
46 #include <fft_result.h>
47 #include <fft_graph.h>
48 #include <cstdlib>
49 +#include <cstring>
50 #include <string>
51 #include <cmath>
52
53 diff -up ardour-2.4/libs/ardour/ardour/buffer.h.gcc43 ardour-2.4/libs/ardour/ardour/buffer.h
54 --- ardour-2.4/libs/ardour/ardour/buffer.h.gcc43 2007-05-10 07:30:33.000000000 -0400
55 +++ ardour-2.4/libs/ardour/ardour/buffer.h 2008-04-05 15:29:00.000000000 -0400
56 @@ -22,6 +22,7 @@
57 #define _XOPEN_SOURCE 600
58 #include <cstdlib> // for posix_memalign
59 #include <cassert>
60 +#include <cstring>
61 #include <ardour/types.h>
62 #include <ardour/data_type.h>
63
64 diff -up ardour-2.4/libs/ardour/ardour/port.h.gcc43 ardour-2.4/libs/ardour/ardour/port.h
65 --- ardour-2.4/libs/ardour/ardour/port.h.gcc43 2007-05-10 07:30:33.000000000 -0400
66 +++ ardour-2.4/libs/ardour/ardour/port.h 2008-04-05 15:29:00.000000000 -0400
67 @@ -20,6 +20,7 @@
68 #ifndef __ardour_port_h__
69 #define __ardour_port_h__
70
71 +#include <cstring>
72 #include <sigc++/signal.h>
73 #include <pbd/failed_constructor.h>
74 #include <ardour/ardour.h>
75 diff -up ardour-2.4/libs/ardour/ardour/silentfilesource.h.gcc43 ardour-2.4/libs/ardour/ardour/silentfilesource.h
76 --- ardour-2.4/libs/ardour/ardour/silentfilesource.h.gcc43 2008-01-30 15:29:38.000000000 -0500
77 +++ ardour-2.4/libs/ardour/ardour/silentfilesource.h 2008-04-05 15:29:00.000000000 -0400
78 @@ -20,6 +20,7 @@
79 #ifndef __ardour_silentfilesource_h__
80 #define __ardour_silentfilesource_h__
81
82 +#include <cstring>
83 #include <ardour/audiofilesource.h>
84
85 namespace ARDOUR {
86 diff -up ardour-2.4/libs/ardour/audioanalyser.cc.gcc43 ardour-2.4/libs/ardour/audioanalyser.cc
87 --- ardour-2.4/libs/ardour/audioanalyser.cc.gcc43 2008-02-16 16:52:28.000000000 -0500
88 +++ ardour-2.4/libs/ardour/audioanalyser.cc 2008-04-05 15:29:00.000000000 -0400
89 @@ -9,6 +9,8 @@
90 #include <ardour/readable.h>
91 #include <ardour/readable.h>
92
93 +#include <cstring>
94 +
95 #include "i18n.h"
96
97 using namespace std;
98 diff -up ardour-2.4/libs/ardour/recent_sessions.cc.gcc43 ardour-2.4/libs/ardour/recent_sessions.cc
99 --- ardour-2.4/libs/ardour/recent_sessions.cc.gcc43 2008-01-29 13:21:54.000000000 -0500
100 +++ ardour-2.4/libs/ardour/recent_sessions.cc 2008-04-05 15:29:00.000000000 -0400
101 @@ -18,6 +18,7 @@
102 */
103
104 #include <cerrno>
105 +#include <cstring>
106 #include <unistd.h>
107 #include <fstream>
108 #include <algorithm>
109 diff -up ardour-2.4/libs/ardour/sndfilesource.cc.gcc43 ardour-2.4/libs/ardour/sndfilesource.cc
110 --- ardour-2.4/libs/ardour/sndfilesource.cc.gcc43 2008-02-27 10:21:21.000000000 -0500
111 +++ ardour-2.4/libs/ardour/sndfilesource.cc 2008-04-05 15:29:00.000000000 -0400
112 @@ -19,6 +19,7 @@
113
114 #include <cerrno>
115 #include <climits>
116 +#include <cstring>
117
118 #include <pwd.h>
119 #include <sys/utsname.h>
120 diff -up ardour-2.4/libs/ardour/utils.cc.gcc43 ardour-2.4/libs/ardour/utils.cc
121 --- ardour-2.4/libs/ardour/utils.cc.gcc43 2008-03-26 21:21:32.000000000 -0400
122 +++ ardour-2.4/libs/ardour/utils.cc 2008-04-05 15:29:00.000000000 -0400
123 @@ -20,7 +20,7 @@
124 #include <cstdio> /* for sprintf */
125 #include <cmath>
126 #include <cctype>
127 -#include <string>
128 +#include <cstring>
129 #include <cerrno>
130 #include <iostream>
131 #include <sys/types.h>
132 diff -up ardour-2.4/libs/midi++2/fd_midiport.cc.gcc43 ardour-2.4/libs/midi++2/fd_midiport.cc
133 --- ardour-2.4/libs/midi++2/fd_midiport.cc.gcc43 2007-09-27 00:20:36.000000000 -0400
134 +++ ardour-2.4/libs/midi++2/fd_midiport.cc 2008-04-05 15:29:00.000000000 -0400
135 @@ -20,6 +20,7 @@
136
137 #include <fcntl.h>
138 #include <cerrno>
139 +#include <cstring>
140
141 #include <pbd/error.h>
142 #include <pbd/pathscanner.h>
143 diff -up ardour-2.4/libs/midi++2/midi.cc.gcc43 ardour-2.4/libs/midi++2/midi.cc
144 --- ardour-2.4/libs/midi++2/midi.cc.gcc43 2007-05-10 07:30:30.000000000 -0400
145 +++ ardour-2.4/libs/midi++2/midi.cc 2008-04-05 15:29:00.000000000 -0400
146 @@ -18,7 +18,7 @@
147 $Id: ardour-2.4-gcc43.patch,v 1.1 2008/04/20 16:54:46 aballier Exp $
148 */
149
150 -#include <string>
151 +#include <cstring>
152 #include <cstdlib>
153 #include <midi++/types.h>
154
155 diff -up ardour-2.4/libs/midi++2/midichannel.cc.gcc43 ardour-2.4/libs/midi++2/midichannel.cc
156 --- ardour-2.4/libs/midi++2/midichannel.cc.gcc43 2007-05-10 07:30:30.000000000 -0400
157 +++ ardour-2.4/libs/midi++2/midichannel.cc 2008-04-05 15:29:00.000000000 -0400
158 @@ -18,6 +18,8 @@
159 $Id: ardour-2.4-gcc43.patch,v 1.1 2008/04/20 16:54:46 aballier Exp $
160 */
161
162 +#include <cstring>
163 +
164 #include <midi++/types.h>
165 #include <midi++/port.h>
166 #include <midi++/channel.h>
167 diff -up ardour-2.4/libs/midi++2/midiparser.cc.gcc43 ardour-2.4/libs/midi++2/midiparser.cc
168 --- ardour-2.4/libs/midi++2/midiparser.cc.gcc43 2007-05-10 07:30:30.000000000 -0400
169 +++ ardour-2.4/libs/midi++2/midiparser.cc 2008-04-05 15:29:00.000000000 -0400
170 @@ -23,7 +23,7 @@
171
172 #include <cstdlib>
173 #include <unistd.h>
174 -#include <string>
175 +#include <cstring>
176 #include <iostream>
177 #include <iterator>
178
179 diff -up ardour-2.4/libs/midi++2/mtc.cc.gcc43 ardour-2.4/libs/midi++2/mtc.cc
180 --- ardour-2.4/libs/midi++2/mtc.cc.gcc43 2007-05-10 07:30:30.000000000 -0400
181 +++ ardour-2.4/libs/midi++2/mtc.cc 2008-04-05 15:29:00.000000000 -0400
182 @@ -20,7 +20,7 @@
183
184 #include <cstdlib>
185 #include <unistd.h>
186 -#include <string>
187 +#include <cstring>
188 #include <iostream>
189
190 #include <midi++/types.h>
191 diff -up ardour-2.4/libs/pbd/base_ui.cc.gcc43 ardour-2.4/libs/pbd/base_ui.cc
192 --- ardour-2.4/libs/pbd/base_ui.cc.gcc43 2007-05-10 07:30:44.000000000 -0400
193 +++ ardour-2.4/libs/pbd/base_ui.cc 2008-04-05 15:29:00.000000000 -0400
194 @@ -20,7 +20,8 @@
195 #include <stdint.h>
196 #include <unistd.h>
197 #include <fcntl.h>
198 -#include <errno.h>
199 +#include <cerrno>
200 +#include <cstring>
201
202 #include <pbd/base_ui.h>
203 #include <pbd/error.h>
204 diff -up ardour-2.4/libs/pbd/mountpoint.cc.gcc43 ardour-2.4/libs/pbd/mountpoint.cc
205 --- ardour-2.4/libs/pbd/mountpoint.cc.gcc43 2007-09-24 11:42:04.000000000 -0400
206 +++ ardour-2.4/libs/pbd/mountpoint.cc 2008-04-05 15:29:00.000000000 -0400
207 @@ -19,6 +19,7 @@
208 */
209
210 #include <cstdio>
211 +#include <cstring>
212 #include <string>
213 #include <limits.h>
214
215 diff -up ardour-2.4/libs/pbd/pathscanner.cc.gcc43 ardour-2.4/libs/pbd/pathscanner.cc
216 --- ardour-2.4/libs/pbd/pathscanner.cc.gcc43 2007-05-10 07:30:44.000000000 -0400
217 +++ ardour-2.4/libs/pbd/pathscanner.cc 2008-04-05 15:29:00.000000000 -0400
218 @@ -20,6 +20,7 @@
219
220 #include <cstdlib>
221 #include <cstdio>
222 +#include <cstring>
223 #include <vector>
224 #include <dirent.h>
225
226 diff -up ardour-2.4/libs/pbd/pbd/ringbuffer.h.gcc43 ardour-2.4/libs/pbd/pbd/ringbuffer.h
227 --- ardour-2.4/libs/pbd/pbd/ringbuffer.h.gcc43 2007-05-10 07:30:44.000000000 -0400
228 +++ ardour-2.4/libs/pbd/pbd/ringbuffer.h 2008-04-05 15:29:00.000000000 -0400
229 @@ -20,6 +20,7 @@
230 #ifndef ringbuffer_h
231 #define ringbuffer_h
232
233 +#include <cstring>
234 #include <glib.h>
235
236 template<class T>
237 diff -up ardour-2.4/libs/pbd/pool.cc.gcc43 ardour-2.4/libs/pbd/pool.cc
238 --- ardour-2.4/libs/pbd/pool.cc.gcc43 2007-07-05 23:11:52.000000000 -0400
239 +++ ardour-2.4/libs/pbd/pool.cc 2008-04-05 15:29:00.000000000 -0400
240 @@ -18,6 +18,7 @@
241 $Id: ardour-2.4-gcc43.patch,v 1.1 2008/04/20 16:54:46 aballier Exp $
242 */
243
244 +#include <cstdlib>
245 #include <iostream>
246 #include <vector>
247
248 diff -up ardour-2.4/libs/rubberband/src/FFT.cpp.gcc43 ardour-2.4/libs/rubberband/src/FFT.cpp
249 --- ardour-2.4/libs/rubberband/src/FFT.cpp.gcc43 2007-12-11 10:30:32.000000000 -0500
250 +++ ardour-2.4/libs/rubberband/src/FFT.cpp 2008-04-05 15:29:00.000000000 -0400
251 @@ -18,6 +18,7 @@
252
253 #include <fftw3.h>
254
255 +#include <cstdlib>
256 #include <cmath>
257 #include <iostream>
258 #include <map>
259 diff -up ardour-2.4/libs/rubberband/src/main.cpp.gcc43 ardour-2.4/libs/rubberband/src/main.cpp
260 --- ardour-2.4/libs/rubberband/src/main.cpp.gcc43 2007-12-11 10:27:07.000000000 -0500
261 +++ ardour-2.4/libs/rubberband/src/main.cpp 2008-04-05 15:29:00.000000000 -0400
262 @@ -14,6 +14,8 @@
263
264 #include "RubberBandStretcher.h"
265
266 +#include <cstdlib>
267 +#include <cstring>
268 #include <iostream>
269 #include <sndfile.h>
270 #include <cmath>
271 diff -up ardour-2.4/libs/rubberband/src/RingBuffer.h.gcc43 ardour-2.4/libs/rubberband/src/RingBuffer.h
272 --- ardour-2.4/libs/rubberband/src/RingBuffer.h.gcc43 2007-12-11 10:27:07.000000000 -0500
273 +++ ardour-2.4/libs/rubberband/src/RingBuffer.h 2008-04-05 15:29:00.000000000 -0400
274 @@ -15,6 +15,7 @@
275 #ifndef _RUBBERBAND_RINGBUFFER_H_
276 #define _RUBBERBAND_RINGBUFFER_H_
277
278 +#include <cstring>
279 #include <sys/types.h>
280
281 #ifndef _WIN32
282 diff -up ardour-2.4/libs/rubberband/src/StretchCalculator.cpp.gcc43 ardour-2.4/libs/rubberband/src/StretchCalculator.cpp
283 --- ardour-2.4/libs/rubberband/src/StretchCalculator.cpp.gcc43 2007-12-11 10:27:07.000000000 -0500
284 +++ ardour-2.4/libs/rubberband/src/StretchCalculator.cpp 2008-04-05 15:29:00.000000000 -0400
285 @@ -14,6 +14,7 @@
286
287 #include "StretchCalculator.h"
288
289 +#include <algorithm>
290 #include <math.h>
291 #include <iostream>
292 #include <deque>
293 diff -up ardour-2.4/libs/rubberband/src/StretcherProcess.cpp.gcc43 ardour-2.4/libs/rubberband/src/StretcherProcess.cpp
294 --- ardour-2.4/libs/rubberband/src/StretcherProcess.cpp.gcc43 2008-01-09 10:19:25.000000000 -0500
295 +++ ardour-2.4/libs/rubberband/src/StretcherProcess.cpp 2008-04-05 15:29:00.000000000 -0400
296 @@ -20,6 +20,7 @@
297 #include "StretcherChannelData.h"
298 #include "Resampler.h"
299
300 +#include <cstring>
301 #include <cassert>
302 #include <cmath>
303 #include <set>
304 diff -up ardour-2.4/libs/rubberband/src/Thread.cpp.gcc43 ardour-2.4/libs/rubberband/src/Thread.cpp
305 --- ardour-2.4/libs/rubberband/src/Thread.cpp.gcc43 2007-12-11 10:27:07.000000000 -0500
306 +++ ardour-2.4/libs/rubberband/src/Thread.cpp 2008-04-05 15:29:00.000000000 -0400
307 @@ -16,6 +16,7 @@
308
309 #include <iostream>
310
311 +#include <cstdlib>
312 #include <sys/time.h>
313 #include <time.h>
314
315 diff -up ardour-2.4/libs/rubberband/src/Window.h.gcc43 ardour-2.4/libs/rubberband/src/Window.h
316 --- ardour-2.4/libs/rubberband/src/Window.h.gcc43 2007-12-11 10:27:07.000000000 -0500
317 +++ ardour-2.4/libs/rubberband/src/Window.h 2008-04-05 15:29:00.000000000 -0400
318 @@ -15,6 +15,7 @@
319 #ifndef _RUBBERBAND_WINDOW_H_
320 #define _RUBBERBAND_WINDOW_H_
321
322 +#include <cstdlib>
323 #include <cmath>
324 #include <iostream>
325 #include <map>
326 diff -up ardour-2.4/libs/surfaces/tranzport/screen.cc.gcc43 ardour-2.4/libs/surfaces/tranzport/screen.cc
327 --- ardour-2.4/libs/surfaces/tranzport/screen.cc.gcc43 2008-04-05 16:55:26.000000000 -0400
328 +++ ardour-2.4/libs/surfaces/tranzport/screen.cc 2008-04-05 16:55:39.000000000 -0400
329 @@ -19,6 +19,7 @@
330 * */
331
332 #include <tranzport_control_protocol.h>
333 +#include <cstring>
334
335 void
336 TranzportControlProtocol::screen_clear ()
337 diff -up ardour-2.4/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp.gcc43 ardour-2.4/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp
338 --- ardour-2.4/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp.gcc43 2008-01-25 11:05:47.000000000 -0500
339 +++ ardour-2.4/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp 2008-04-05 15:29:00.000000000 -0400
340 @@ -42,6 +42,7 @@
341
342 #include <fstream>
343 #include <cctype> // tolower
344 +#include <cstring>
345
346 #ifdef _WIN32
347
348 diff -up ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp.gcc43 ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp
349 --- ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp.gcc43 2008-01-10 08:48:10.000000000 -0500
350 +++ ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp 2008-04-05 15:29:00.000000000 -0400
351 @@ -36,6 +36,9 @@
352
353 #include "PluginAdapter.h"
354
355 +#include <cstdlib>
356 +#include <cstring>
357 +
358 //#define DEBUG_PLUGIN_ADAPTER 1
359
360
361 diff -up ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp.gcc43 ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp
362 --- ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp.gcc43 2008-01-10 08:48:10.000000000 -0500
363 +++ ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp 2008-04-05 15:29:00.000000000 -0400
364 @@ -36,6 +36,8 @@
365
366 #include "PluginHostAdapter.h"
367
368 +#include <cstdlib>
369 +
370 namespace Vamp
371 {
372
373
374
375
376 --
377 gentoo-commits@l.g.o mailing list