Fix build with gcc 4.3, by jwrdegoede, reported by David Carlos Manuelda <StormByte@gmail.com>, bug #217307

Package-Manager: portage-2.1.5_rc5

4 files changed, 371 insertions, 7 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index 7564004ee63d..e6eedf5b6abf 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/ardour
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.74 2008/04/20 16:20:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.75 2008/04/20 16:54:45 aballier Exp $
+
+  20 Apr 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/ardour-2.4-gcc43.patch, ardour-2.4.1.ebuild:
+  Fix build with gcc 4.3, by jwrdegoede, reported by David Carlos Manuelda
+  <StormByte@gmail.com>, bug #217307
 
   20 Apr 2008; Alexis Ballier <aballier@gentoo.org> -ardour-2.3.1.ebuild,
   -ardour-2.4.ebuild:
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index e4370f913484..9832595d1fab 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -5,16 +5,17 @@ AUX ardour-2.0.3-cflags.patch 1205 RMD160 e7b3c10835fb4228603f3c9455809bfab5847a
 AUX ardour-2.0.3-sndfile-external.patch 1409 RMD160 cbc6381f17a7978caa56aff0d5e0ce8b64f7161d SHA1 6559d30abdc3a89121097ed2649872806ce4a736 SHA256 71542baed4deeae9505107973361a5aab06f49ceaeb3bf7d2e7c5ffd73cc604d
 AUX ardour-2.3.1-soundtouch.patch 920 RMD160 ca2c41c990dcaf7dcc4bba8ba6ef26ba712233bf SHA1 97ec6abe0e4ad5453a001976879afcc93ebc73de SHA256 e6395d043f7c6d6fb003e1d5024150e80fdf1a6ec626468c569d3ec61d9c17ab
 AUX ardour-2.4-cflags.patch 1199 RMD160 32e6f8c22e1f83072f3183a26f02c2e66fe61401 SHA1 bf6c46463df21a2cc431fa17180fe91069a99a21 SHA256 ba59b111d4d93081aa743793d3307e18c6a06560e1500c3700ee0930df7f2f5b
+AUX ardour-2.4-gcc43.patch 12717 RMD160 6e1a76ce2a5b85a049513ee7d32a70467ea0fc12 SHA1 7b618d17c1e9bf2b533c2b51639e95f2a71790de SHA256 8e7e130ce67cc6541c3a94a8485e59580ec79362868362682ddbe38408c711b2
 DIST ardour-2.0.5.tar.bz2 2777524 RMD160 eb278fbd7121707b9b7d4dfbb1e2088ef36cb1d4 SHA1 9a3adea22c5f182832b90506cb354097c21caa4f SHA256 976b87920a3bd481b06edcbc756d1c5425397286f9b2a14546705a1f60a60848
 DIST ardour-2.4.1.tar.bz2 3147427 RMD160 cad214271af97707da76701d2e8c65cb7b598e5f SHA1 d7c2f786711fc98598a090aa076a91bcd444b0e4 SHA256 29d6ca482e13e58058616b6118a0d036429db2141fbd95811d7ad7536690484e
 EBUILD ardour-2.0.5.ebuild 3240 RMD160 5a625dfad2ab4ba0fade90cd13d98ea469ef03b1 SHA1 078f58a80e21f8f8b9887ce5cca4783c71a31d7d SHA256 e87e65758e368b6cb3b325b56559a93c8215369e48c8c6f18445a29e1ce3cb79
-EBUILD ardour-2.4.1.ebuild 3718 RMD160 252361a3e7a3bdb1f24af3c79b6ebe962730d2ed SHA1 8edcaf964b56afe66d61b5898fa1eab51ef0ce45 SHA256 4cad8c1880d441c809ecc97defcaf2574df63a235a51fb3ab71e201de8673df3
-MISC ChangeLog 11534 RMD160 7c11c17ffd1bf9636661515a8047c5d8d04c02eb SHA1 1888077b327e0448218f0e185230643436ceb625 SHA256 fe73daee6c6f3026a9e290b8f5e91dcb52ce474f51da5aee26c4dbcf4cc3a835
+EBUILD ardour-2.4.1.ebuild 3762 RMD160 3e2eeed0cd129f3b3c2cd4bdb87728705b0ff18f SHA1 b31c6b2c3239532b58e471847dbe4a807eb2ad5a SHA256 e31a2ab3799fd44dc77a65b0d2209fe74b2ef0aa6840bb2d3a983f878d6c829c
+MISC ChangeLog 11753 RMD160 d27b3b932d34feea2dee29fec914627de3aa1e1b SHA1 c437d01e3c511a431207edb72c7532d7f31f46cd SHA256 b189c1d9e8f44227b4c30c5235b16e95154770b819fbd316731a5b51ddad481c
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgLbWsACgkQvFcC4BYPU0qp0gCgw20XWsjs+rdbd1R7HHa5u7E8
-Y78AniqLzYjkCT93woaDmcJnhZmfJoTa
-=1RFy
+iEYEARECAAYFAkgLdWMACgkQvFcC4BYPU0rujwCgkwMQgyyrEKaGLv75GJCQXBi3
+8oYAn3wVsIUCVZa/U2rSeDgLSqAeQmCj
+=5k20
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ardour/ardour-2.4.1.ebuild b/media-sound/ardour/ardour-2.4.1.ebuild
index 2f4b1ec6bc09..e1e02e2ad5ef 100644
--- a/media-sound/ardour/ardour-2.4.1.ebuild
+++ b/media-sound/ardour/ardour-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.4.1.ebuild,v 1.1 2008/04/10 08:02:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.4.1.ebuild,v 1.2 2008/04/20 16:54:45 aballier Exp $
 
 inherit eutils toolchain-funcs flag-o-matic versionator
 
@@ -69,6 +69,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-2.0.3-sndfile-external.patch"
 	epatch "${FILESDIR}/${PN}-2.4-cflags.patch"
 	epatch "${FILESDIR}/${PN}-2.3.1-soundtouch.patch"
+	epatch "${FILESDIR}/${PN}-2.4-gcc43.patch"
 }
 
 ardour_use_enable() {
diff --git a/media-sound/ardour/files/ardour-2.4-gcc43.patch b/media-sound/ardour/files/ardour-2.4-gcc43.patch
new file mode 100644
index 000000000000..4ccb85b21f30
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.4-gcc43.patch
@@ -0,0 +1,357 @@
+http://tracker.ardour.org/view.php?id=2181
+
+diff -up ardour-2.4/gtk2_ardour/actions.cc.gcc43 ardour-2.4/gtk2_ardour/actions.cc
+--- ardour-2.4/gtk2_ardour/actions.cc.gcc43	2008-03-31 08:07:53.000000000 -0400
++++ ardour-2.4/gtk2_ardour/actions.cc	2008-04-05 15:29:00.000000000 -0400
+@@ -17,6 +17,7 @@
+ 
+ */
+ 
++#include <cstring>
+ #include <vector>
+ #include <string>
+ #include <list>
+diff -up ardour-2.4/gtk2_ardour/editing.cc.gcc43 ardour-2.4/gtk2_ardour/editing.cc
+--- ardour-2.4/gtk2_ardour/editing.cc.gcc43	2008-04-05 15:34:10.000000000 -0400
++++ ardour-2.4/gtk2_ardour/editing.cc	2008-04-05 15:34:21.000000000 -0400
+@@ -17,7 +17,7 @@
+ 
+ */
+ 
+-#include <string>
++#include <cstring>
+ 
+ #include "editing.h"
+ 
+diff -up ardour-2.4/gtk2_ardour/editing_syms.h.gcc43 ardour-2.4/gtk2_ardour/editing_syms.h
+diff -up ardour-2.4/gtk2_ardour/fft_result.cc.gcc43 ardour-2.4/gtk2_ardour/fft_result.cc
+--- ardour-2.4/gtk2_ardour/fft_result.cc.gcc43	2008-04-05 16:47:41.000000000 -0400
++++ ardour-2.4/gtk2_ardour/fft_result.cc	2008-04-05 16:53:14.000000000 -0400
+@@ -21,6 +21,7 @@
+ #include <fft_result.h>
+ #include <fft_graph.h>
+ #include <cstdlib>
++#include <cstring>
+ #include <string>
+ #include <cmath>
+ 
+diff -up ardour-2.4/libs/ardour/ardour/buffer.h.gcc43 ardour-2.4/libs/ardour/ardour/buffer.h
+--- ardour-2.4/libs/ardour/ardour/buffer.h.gcc43	2007-05-10 07:30:33.000000000 -0400
++++ ardour-2.4/libs/ardour/ardour/buffer.h	2008-04-05 15:29:00.000000000 -0400
+@@ -22,6 +22,7 @@
+ #define _XOPEN_SOURCE 600
+ #include <cstdlib> // for posix_memalign
+ #include <cassert>
++#include <cstring>
+ #include <ardour/types.h>
+ #include <ardour/data_type.h>
+ 
+diff -up ardour-2.4/libs/ardour/ardour/port.h.gcc43 ardour-2.4/libs/ardour/ardour/port.h
+--- ardour-2.4/libs/ardour/ardour/port.h.gcc43	2007-05-10 07:30:33.000000000 -0400
++++ ardour-2.4/libs/ardour/ardour/port.h	2008-04-05 15:29:00.000000000 -0400
+@@ -20,6 +20,7 @@
+ #ifndef __ardour_port_h__
+ #define __ardour_port_h__
+ 
++#include <cstring>
+ #include <sigc++/signal.h>
+ #include <pbd/failed_constructor.h>
+ #include <ardour/ardour.h>
+diff -up ardour-2.4/libs/ardour/ardour/silentfilesource.h.gcc43 ardour-2.4/libs/ardour/ardour/silentfilesource.h
+--- ardour-2.4/libs/ardour/ardour/silentfilesource.h.gcc43	2008-01-30 15:29:38.000000000 -0500
++++ ardour-2.4/libs/ardour/ardour/silentfilesource.h	2008-04-05 15:29:00.000000000 -0400
+@@ -20,6 +20,7 @@
+ #ifndef __ardour_silentfilesource_h__ 
+ #define __ardour_silentfilesource_h__
+ 
++#include <cstring>
+ #include <ardour/audiofilesource.h>
+ 
+ namespace ARDOUR {
+diff -up ardour-2.4/libs/ardour/audioanalyser.cc.gcc43 ardour-2.4/libs/ardour/audioanalyser.cc
+--- ardour-2.4/libs/ardour/audioanalyser.cc.gcc43	2008-02-16 16:52:28.000000000 -0500
++++ ardour-2.4/libs/ardour/audioanalyser.cc	2008-04-05 15:29:00.000000000 -0400
+@@ -9,6 +9,8 @@
+ #include <ardour/readable.h>
+ #include <ardour/readable.h>
+ 
++#include <cstring>
++
+ #include "i18n.h"
+ 
+ using namespace std;
+diff -up ardour-2.4/libs/ardour/recent_sessions.cc.gcc43 ardour-2.4/libs/ardour/recent_sessions.cc
+--- ardour-2.4/libs/ardour/recent_sessions.cc.gcc43	2008-01-29 13:21:54.000000000 -0500
++++ ardour-2.4/libs/ardour/recent_sessions.cc	2008-04-05 15:29:00.000000000 -0400
+@@ -18,6 +18,7 @@
+ */
+ 
+ #include <cerrno>
++#include <cstring>
+ #include <unistd.h>
+ #include <fstream>
+ #include <algorithm>
+diff -up ardour-2.4/libs/ardour/sndfilesource.cc.gcc43 ardour-2.4/libs/ardour/sndfilesource.cc
+--- ardour-2.4/libs/ardour/sndfilesource.cc.gcc43	2008-02-27 10:21:21.000000000 -0500
++++ ardour-2.4/libs/ardour/sndfilesource.cc	2008-04-05 15:29:00.000000000 -0400
+@@ -19,6 +19,7 @@
+ 
+ #include <cerrno>
+ #include <climits>
++#include <cstring>
+ 
+ #include <pwd.h>
+ #include <sys/utsname.h>
+diff -up ardour-2.4/libs/ardour/utils.cc.gcc43 ardour-2.4/libs/ardour/utils.cc
+--- ardour-2.4/libs/ardour/utils.cc.gcc43	2008-03-26 21:21:32.000000000 -0400
++++ ardour-2.4/libs/ardour/utils.cc	2008-04-05 15:29:00.000000000 -0400
+@@ -20,7 +20,7 @@
+ #include <cstdio> /* for sprintf */
+ #include <cmath>
+ #include <cctype>
+-#include <string>
++#include <cstring>
+ #include <cerrno>
+ #include <iostream>
+ #include <sys/types.h>
+diff -up ardour-2.4/libs/midi++2/fd_midiport.cc.gcc43 ardour-2.4/libs/midi++2/fd_midiport.cc
+--- ardour-2.4/libs/midi++2/fd_midiport.cc.gcc43	2007-09-27 00:20:36.000000000 -0400
++++ ardour-2.4/libs/midi++2/fd_midiport.cc	2008-04-05 15:29:00.000000000 -0400
+@@ -20,6 +20,7 @@
+ 
+ #include <fcntl.h>
+ #include <cerrno>
++#include <cstring>
+ 
+ #include <pbd/error.h>
+ #include <pbd/pathscanner.h>
+diff -up ardour-2.4/libs/midi++2/midi.cc.gcc43 ardour-2.4/libs/midi++2/midi.cc
+--- ardour-2.4/libs/midi++2/midi.cc.gcc43	2007-05-10 07:30:30.000000000 -0400
++++ ardour-2.4/libs/midi++2/midi.cc	2008-04-05 15:29:00.000000000 -0400
+@@ -18,7 +18,7 @@
+     $Id: ardour-2.4-gcc43.patch,v 1.1 2008/04/20 16:54:46 aballier Exp $
+ */
+ 
+-#include <string>
++#include <cstring>
+ #include <cstdlib>
+ #include <midi++/types.h>
+ 
+diff -up ardour-2.4/libs/midi++2/midichannel.cc.gcc43 ardour-2.4/libs/midi++2/midichannel.cc
+--- ardour-2.4/libs/midi++2/midichannel.cc.gcc43	2007-05-10 07:30:30.000000000 -0400
++++ ardour-2.4/libs/midi++2/midichannel.cc	2008-04-05 15:29:00.000000000 -0400
+@@ -18,6 +18,8 @@
+     $Id: ardour-2.4-gcc43.patch,v 1.1 2008/04/20 16:54:46 aballier Exp $
+ */
+ 
++#include <cstring>
++
+ #include <midi++/types.h>
+ #include <midi++/port.h>
+ #include <midi++/channel.h>
+diff -up ardour-2.4/libs/midi++2/midiparser.cc.gcc43 ardour-2.4/libs/midi++2/midiparser.cc
+--- ardour-2.4/libs/midi++2/midiparser.cc.gcc43	2007-05-10 07:30:30.000000000 -0400
++++ ardour-2.4/libs/midi++2/midiparser.cc	2008-04-05 15:29:00.000000000 -0400
+@@ -23,7 +23,7 @@
+ 
+ #include <cstdlib>
+ #include <unistd.h>
+-#include <string>
++#include <cstring>
+ #include <iostream>
+ #include <iterator>
+ 
+diff -up ardour-2.4/libs/midi++2/mtc.cc.gcc43 ardour-2.4/libs/midi++2/mtc.cc
+--- ardour-2.4/libs/midi++2/mtc.cc.gcc43	2007-05-10 07:30:30.000000000 -0400
++++ ardour-2.4/libs/midi++2/mtc.cc	2008-04-05 15:29:00.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ #include <cstdlib>
+ #include <unistd.h>
+-#include <string>
++#include <cstring>
+ #include <iostream>
+ 
+ #include <midi++/types.h>
+diff -up ardour-2.4/libs/pbd/base_ui.cc.gcc43 ardour-2.4/libs/pbd/base_ui.cc
+--- ardour-2.4/libs/pbd/base_ui.cc.gcc43	2007-05-10 07:30:44.000000000 -0400
++++ ardour-2.4/libs/pbd/base_ui.cc	2008-04-05 15:29:00.000000000 -0400
+@@ -20,7 +20,8 @@
+ #include <stdint.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+-#include <errno.h>
++#include <cerrno>
++#include <cstring>
+ 
+ #include <pbd/base_ui.h>
+ #include <pbd/error.h>
+diff -up ardour-2.4/libs/pbd/mountpoint.cc.gcc43 ardour-2.4/libs/pbd/mountpoint.cc
+--- ardour-2.4/libs/pbd/mountpoint.cc.gcc43	2007-09-24 11:42:04.000000000 -0400
++++ ardour-2.4/libs/pbd/mountpoint.cc	2008-04-05 15:29:00.000000000 -0400
+@@ -19,6 +19,7 @@
+ */
+ 
+ #include <cstdio>
++#include <cstring>
+ #include <string>
+ #include <limits.h>
+ 
+diff -up ardour-2.4/libs/pbd/pathscanner.cc.gcc43 ardour-2.4/libs/pbd/pathscanner.cc
+--- ardour-2.4/libs/pbd/pathscanner.cc.gcc43	2007-05-10 07:30:44.000000000 -0400
++++ ardour-2.4/libs/pbd/pathscanner.cc	2008-04-05 15:29:00.000000000 -0400
+@@ -20,6 +20,7 @@
+ 
+ #include <cstdlib>
+ #include <cstdio>
++#include <cstring>
+ #include <vector>
+ #include <dirent.h>
+ 
+diff -up ardour-2.4/libs/pbd/pbd/ringbuffer.h.gcc43 ardour-2.4/libs/pbd/pbd/ringbuffer.h
+--- ardour-2.4/libs/pbd/pbd/ringbuffer.h.gcc43	2007-05-10 07:30:44.000000000 -0400
++++ ardour-2.4/libs/pbd/pbd/ringbuffer.h	2008-04-05 15:29:00.000000000 -0400
+@@ -20,6 +20,7 @@
+ #ifndef ringbuffer_h
+ #define ringbuffer_h
+ 
++#include <cstring>
+ #include <glib.h>
+ 
+ template<class T>
+diff -up ardour-2.4/libs/pbd/pool.cc.gcc43 ardour-2.4/libs/pbd/pool.cc
+--- ardour-2.4/libs/pbd/pool.cc.gcc43	2007-07-05 23:11:52.000000000 -0400
++++ ardour-2.4/libs/pbd/pool.cc	2008-04-05 15:29:00.000000000 -0400
+@@ -18,6 +18,7 @@
+     $Id: ardour-2.4-gcc43.patch,v 1.1 2008/04/20 16:54:46 aballier Exp $
+ */
+ 
++#include <cstdlib>
+ #include <iostream>
+ #include <vector>
+ 
+diff -up ardour-2.4/libs/rubberband/src/FFT.cpp.gcc43 ardour-2.4/libs/rubberband/src/FFT.cpp
+--- ardour-2.4/libs/rubberband/src/FFT.cpp.gcc43	2007-12-11 10:30:32.000000000 -0500
++++ ardour-2.4/libs/rubberband/src/FFT.cpp	2008-04-05 15:29:00.000000000 -0400
+@@ -18,6 +18,7 @@
+ 
+ #include <fftw3.h>
+ 
++#include <cstdlib>
+ #include <cmath>
+ #include <iostream>
+ #include <map>
+diff -up ardour-2.4/libs/rubberband/src/main.cpp.gcc43 ardour-2.4/libs/rubberband/src/main.cpp
+--- ardour-2.4/libs/rubberband/src/main.cpp.gcc43	2007-12-11 10:27:07.000000000 -0500
++++ ardour-2.4/libs/rubberband/src/main.cpp	2008-04-05 15:29:00.000000000 -0400
+@@ -14,6 +14,8 @@
+ 
+ #include "RubberBandStretcher.h"
+ 
++#include <cstdlib>
++#include <cstring>
+ #include <iostream>
+ #include <sndfile.h>
+ #include <cmath>
+diff -up ardour-2.4/libs/rubberband/src/RingBuffer.h.gcc43 ardour-2.4/libs/rubberband/src/RingBuffer.h
+--- ardour-2.4/libs/rubberband/src/RingBuffer.h.gcc43	2007-12-11 10:27:07.000000000 -0500
++++ ardour-2.4/libs/rubberband/src/RingBuffer.h	2008-04-05 15:29:00.000000000 -0400
+@@ -15,6 +15,7 @@
+ #ifndef _RUBBERBAND_RINGBUFFER_H_
+ #define _RUBBERBAND_RINGBUFFER_H_
+ 
++#include <cstring>
+ #include <sys/types.h>
+ 
+ #ifndef _WIN32
+diff -up ardour-2.4/libs/rubberband/src/StretchCalculator.cpp.gcc43 ardour-2.4/libs/rubberband/src/StretchCalculator.cpp
+--- ardour-2.4/libs/rubberband/src/StretchCalculator.cpp.gcc43	2007-12-11 10:27:07.000000000 -0500
++++ ardour-2.4/libs/rubberband/src/StretchCalculator.cpp	2008-04-05 15:29:00.000000000 -0400
+@@ -14,6 +14,7 @@
+ 
+ #include "StretchCalculator.h"
+ 
++#include <algorithm>
+ #include <math.h>
+ #include <iostream>
+ #include <deque>
+diff -up ardour-2.4/libs/rubberband/src/StretcherProcess.cpp.gcc43 ardour-2.4/libs/rubberband/src/StretcherProcess.cpp
+--- ardour-2.4/libs/rubberband/src/StretcherProcess.cpp.gcc43	2008-01-09 10:19:25.000000000 -0500
++++ ardour-2.4/libs/rubberband/src/StretcherProcess.cpp	2008-04-05 15:29:00.000000000 -0400
+@@ -20,6 +20,7 @@
+ #include "StretcherChannelData.h"
+ #include "Resampler.h"
+ 
++#include <cstring>
+ #include <cassert>
+ #include <cmath>
+ #include <set>
+diff -up ardour-2.4/libs/rubberband/src/Thread.cpp.gcc43 ardour-2.4/libs/rubberband/src/Thread.cpp
+--- ardour-2.4/libs/rubberband/src/Thread.cpp.gcc43	2007-12-11 10:27:07.000000000 -0500
++++ ardour-2.4/libs/rubberband/src/Thread.cpp	2008-04-05 15:29:00.000000000 -0400
+@@ -16,6 +16,7 @@
+ 
+ #include <iostream>
+ 
++#include <cstdlib>
+ #include <sys/time.h>
+ #include <time.h>
+ 
+diff -up ardour-2.4/libs/rubberband/src/Window.h.gcc43 ardour-2.4/libs/rubberband/src/Window.h
+--- ardour-2.4/libs/rubberband/src/Window.h.gcc43	2007-12-11 10:27:07.000000000 -0500
++++ ardour-2.4/libs/rubberband/src/Window.h	2008-04-05 15:29:00.000000000 -0400
+@@ -15,6 +15,7 @@
+ #ifndef _RUBBERBAND_WINDOW_H_
+ #define _RUBBERBAND_WINDOW_H_
+ 
++#include <cstdlib>
+ #include <cmath>
+ #include <iostream>
+ #include <map>
+diff -up ardour-2.4/libs/surfaces/tranzport/screen.cc.gcc43 ardour-2.4/libs/surfaces/tranzport/screen.cc
+--- ardour-2.4/libs/surfaces/tranzport/screen.cc.gcc43	2008-04-05 16:55:26.000000000 -0400
++++ ardour-2.4/libs/surfaces/tranzport/screen.cc	2008-04-05 16:55:39.000000000 -0400
+@@ -19,6 +19,7 @@
+  *   */
+ 
+ #include <tranzport_control_protocol.h>
++#include <cstring>
+ 
+ void
+ TranzportControlProtocol::screen_clear ()
+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
+--- ardour-2.4/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp.gcc43	2008-01-25 11:05:47.000000000 -0500
++++ ardour-2.4/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp	2008-04-05 15:29:00.000000000 -0400
+@@ -42,6 +42,7 @@
+ 
+ #include <fstream>
+ #include <cctype> // tolower
++#include <cstring>
+ 
+ #ifdef _WIN32
+ 
+diff -up ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp.gcc43 ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp
+--- ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp.gcc43	2008-01-10 08:48:10.000000000 -0500
++++ ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp	2008-04-05 15:29:00.000000000 -0400
+@@ -36,6 +36,9 @@
+ 
+ #include "PluginAdapter.h"
+ 
++#include <cstdlib>
++#include <cstring>
++
+ //#define DEBUG_PLUGIN_ADAPTER 1
+ 
+ 
+diff -up ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp.gcc43 ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp
+--- ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp.gcc43	2008-01-10 08:48:10.000000000 -0500
++++ ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp	2008-04-05 15:29:00.000000000 -0400
+@@ -36,6 +36,8 @@
+ 
+ #include "PluginHostAdapter.h"
+ 
++#include <cstdlib>
++
+ namespace Vamp
+ {
+