[proaudio] [1214] ardour: add gcc-4.3 fix, make custom-cflags optional

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ]


Revision: 1214
Author:   gimpel
Date:     2008-05-03 14:19:31 +0200 (Sat, 03 May 2008)

Log Message:
-----------
ardour: add gcc-4.3 fix, make custom-cflags optional

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/ardour/ChangeLog
    trunk/overlays/proaudio/media-sound/ardour/Manifest
    trunk/overlays/proaudio/media-sound/ardour/ardour-2.4.1.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/ardour/files/ardour-2.4-cflags.patch
    trunk/overlays/proaudio/media-sound/ardour/files/ardour-2.4-gcc43.patch


Modified: trunk/overlays/proaudio/media-sound/ardour/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ChangeLog	2008-05-03 10:08:25 UTC (rev 1213)
+++ trunk/overlays/proaudio/media-sound/ardour/ChangeLog	2008-05-03 12:19:31 UTC (rev 1214)
@@ -2,6 +2,11 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 May 2008; Thomas Kuther <gimpel@xxxxxxxxxxxxxxxx>
+  +files/ardour-2.4-cflags.patch, +files/ardour-2.4-gcc43.patch,
+  ardour-2.4.1.ebuild:
+  add gcc-4.3 patch, make custom-cflags optional
+
   10 Apr 2008; Marc-Olivier Barre <marco@xxxxxxxxxxxxxxxx>; ardour-2.4.1.ebuild:
   * Version bump
   * Disabled the CFLAGS patch until it's fixed

Modified: trunk/overlays/proaudio/media-sound/ardour/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/Manifest	2008-05-03 10:08:25 UTC (rev 1213)
+++ trunk/overlays/proaudio/media-sound/ardour/Manifest	2008-05-03 12:19:31 UTC (rev 1214)
@@ -1,7 +1,9 @@
 AUX ardour-2.0.3-cflags.patch 1205 RMD160 e7b3c10835fb4228603f3c9455809bfab5847a3e SHA1 22260d62a9ff67baeed07f5fdc6f4dcf95656ddd SHA256 892180ba5e622219def261a647e80f7214bb3f6ce829804a11a25ae57d2ea4be
 AUX ardour-2.0.3-sndfile-external.patch 1409 RMD160 cbc6381f17a7978caa56aff0d5e0ce8b64f7161d SHA1 6559d30abdc3a89121097ed2649872806ce4a736 SHA256 71542baed4deeae9505107973361a5aab06f49ceaeb3bf7d2e7c5ffd73cc604d
 AUX ardour-2.3.1-find_soundtouch.patch 854 RMD160 0d5eb1c4b508ecf4065abff6ae478d1c205e6e0c SHA1 335b1f2e847de16f443773a024494851d0514073 SHA256 6996c289b5711a5552c2d2dc841226b1b749a2a51a6044e32264a7007de5384d
+AUX ardour-2.4-cflags.patch 1199 RMD160 32e6f8c22e1f83072f3183a26f02c2e66fe61401 SHA1 bf6c46463df21a2cc431fa17180fe91069a99a21 SHA256 ba59b111d4d93081aa743793d3307e18c6a06560e1500c3700ee0930df7f2f5b
 AUX ardour-2.4-find_soundtouch.patch 854 RMD160 0d5eb1c4b508ecf4065abff6ae478d1c205e6e0c SHA1 335b1f2e847de16f443773a024494851d0514073 SHA256 6996c289b5711a5552c2d2dc841226b1b749a2a51a6044e32264a7007de5384d
+AUX ardour-2.4-gcc43.patch 12717 RMD160 6e1a76ce2a5b85a049513ee7d32a70467ea0fc12 SHA1 7b618d17c1e9bf2b533c2b51639e95f2a71790de SHA256 8e7e130ce67cc6541c3a94a8485e59580ec79362868362682ddbe38408c711b2
 AUX ardour-2.4.1-find_soundtouch.patch 854 RMD160 0d5eb1c4b508ecf4065abff6ae478d1c205e6e0c SHA1 335b1f2e847de16f443773a024494851d0514073 SHA256 6996c289b5711a5552c2d2dc841226b1b749a2a51a6044e32264a7007de5384d
 DIST ardour-2.0.5.tar.bz2 2777524 RMD160 eb278fbd7121707b9b7d4dfbb1e2088ef36cb1d4 SHA1 9a3adea22c5f182832b90506cb354097c21caa4f SHA256 976b87920a3bd481b06edcbc756d1c5425397286f9b2a14546705a1f60a60848
 DIST ardour-2.1.tar.bz2 2788128 RMD160 70796eb07911c5301049fb2d2749cbaa7a04ba4d SHA1 fcfb1230b9e7ec42c0044be89a6e25aa31a75658 SHA256 160482d87d8eb2188481fc42d7f6442efe6bff38544a321a79e2e23a7aa9501b
@@ -13,9 +15,9 @@
 EBUILD ardour-2.1.ebuild 4205 RMD160 c1009642cb3ab16b14663fd9903b7f2be417445d SHA1 d51e9d56bd8dfba515ab83bf186225473ba031cc SHA256 8022e867006cf705163b6928c705a010e3dbb75f50f73f271a1191dc34aeca6a
 EBUILD ardour-2.2.ebuild 4205 RMD160 74950f3ef10f5330949d7ccb0d13ed287db965aa SHA1 d0fd6eb6b4e4587f11bece468895922e8f270de8 SHA256 906c66c2efb70f1163c84170d530ef8091f8b4cba97a83cf28b32b82243c1aa7
 EBUILD ardour-2.3.1.ebuild 4335 RMD160 d014b0d33d4f91171f9d1fdf0a5edef21203f346 SHA1 a6cc6129a0dd006fcd0bd90d4afc4f7c54494056 SHA256 bdba75247f86b18dc64347c5fbc2ccf8894dee39fc559f289e60ede67dc3530b
-EBUILD ardour-2.4.1.ebuild 4398 RMD160 899274601c5f7a9fa7063ae82cc8988c145981e7 SHA1 08c7b0ea5591d0c309c943855dd0ea5b77bdeee9 SHA256 c4b371f02b84e03352ac4b28ebacd192115fe0445c12e6dba2bf461294c25a7f
+EBUILD ardour-2.4.1.ebuild 4577 RMD160 b603d17c4637c9cca0fdc2098c7243f096bf83d7 SHA1 3f4b23e6673a981a8599fadbfb16343a2952b569 SHA256 168407ccf6186204489ab7c993b4007990cb1670b85f147980913f80ab631e6c
 EBUILD ardour-2.4.ebuild 4453 RMD160 dc5fdf49c476d32113860118c5fcb7b4fae1f1ee SHA1 c8484b8f857453afe657d9f0de58d8a7a6a6ff9a SHA256 a209caa3d6bf0ffe53d8f7c8e18e58273cc2d60751ac6f55124a78024a665c96
 EBUILD ardour-2.9999.ebuild 3655 RMD160 e196a6e98bebe8d3631b817293e9facbe8e90e8e SHA1 99efefa79210d78500a9f617d3f40a83ac9bbbf0 SHA256 9ff4fb649a1576278b8b89f125a0c3a2270c63b3b0c028293f0d6f86ef645262
 EBUILD ardour-99992.ebuild 3357 RMD160 8f20b5e6598f87d1fca4573b7cf1d12ec48defbb SHA1 b1d3f58ed9a2da4db5f7c5e9641e8bc3222f3757 SHA256 4d1e7740509fd04d9e7aa06c6263fe0c81ee28d1d05816505ee780f28ea57299
-MISC ChangeLog 1672 RMD160 3452a97b2a8c52abef79d74b93cfd0e4e52c5b2f SHA1 114d4468e3f9cda50b39b460bd5ed7b0ef4898ac SHA256 b8b93ef20118a7b7fcdd0ff4f19cd687c384dfc4c45adc8144f65bee82eda8cd
+MISC ChangeLog 1865 RMD160 446b1f59d12d201d649609400a89e0718e3fc585 SHA1 b85b8e7b914ee56b10d024e87ea169162cd403a2 SHA256 eee9faa3d414d25ec8932d33bc467487d164c03bc8f1a4c47408e1b386b11d5d
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/ardour/ardour-2.4.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ardour-2.4.1.ebuild	2008-05-03 10:08:25 UTC (rev 1213)
+++ trunk/overlays/proaudio/media-sound/ardour/ardour-2.4.1.ebuild	2008-05-03 12:19:31 UTC (rev 1214)
@@ -11,7 +11,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="altivec debug nls sse sys-libs vst lv2 freesound"
+IUSE="altivec debug nls sse sys-libs vst lv2 freesound custom-cflags"
 
 RDEPEND="media-libs/liblo
 	>=media-libs/liblrdf-0.4.0
@@ -36,6 +36,7 @@
 		>=dev-cpp/libgnomecanvasmm-2.12.0
 		>=media-libs/libsndfile-1.0.16
 		>=media-libs/libsoundtouch-1.0 )
+	freesound? ( net-misc/curl )
 	lv2? ( =media-libs/slv2-9999 )"
 
 DEPEND="${RDEPEND}
@@ -81,13 +82,16 @@
 	unpack ${A}
 	cd "${S}"
 
-	# patcher "${FILESDIR}/${PN}-2.0.3-cflags.patch" -a -f
-
 	# SYSLIBS also use external sndfile
 	use sys-libs && epatch "${FILESDIR}/${PN}-2.0.3-sndfile-external.patch"
-
+	# optional custom cflags
+	use custom-cflags && epatch "${FILESDIR}/${PN}-2.4-cflags.patch"
+	# find libsoundtouch
 	epatch "${FILESDIR}/${P}-find_soundtouch.patch"
+	# GCC 4.3 fix
+	epatch "${FILESDIR}/${PN}-2.4-gcc43.patch"
 
+	# set up VST stuff
 	ardour_vst_prepare
 }
 

Added: trunk/overlays/proaudio/media-sound/ardour/files/ardour-2.4-cflags.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/files/ardour-2.4-cflags.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/ardour/files/ardour-2.4-cflags.patch	2008-05-03 12:19:31 UTC (rev 1214)
@@ -0,0 +1,37 @@
+Index: ardour-2.4/SConstruct
+===================================================================
+--- ardour-2.4.orig/SConstruct
++++ ardour-2.4/SConstruct
+@@ -27,6 +27,7 @@ subst_dict = { }
+ opts = Options('scache.conf')
+ opts.AddOptions(
+     ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''),
++    ('CFLAGS', 'Set custom CFLAGS',''),
+     ('WINDOWS_KEY', 'Set X Modifier (Mod1,Mod2,Mod3,Mod4,Mod5) for "Windows" key', 'Mod4'),
+     BoolOption('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0),
+     BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0),
+@@ -771,14 +772,18 @@ if env['ARCH'] != '':
+ # prepend boiler plate optimization flags
+ #
+ 
+-opt_flags[:0] = [
+-    "-O3",
+-    "-fomit-frame-pointer",
+-    "-ffast-math",
+-    "-fstrength-reduce",
+-    "-pipe"
++if env['CFLAGS'] != '':
++    opt_flags[:0]=env['CFLAGS'].split()
++else:
++    opt_flags[:0] = [
++        "-O3",
++        "-fomit-frame-pointer",
++        "-ffast-math",
++        "-fstrength-reduce",
++        "-pipe"
+     ]
+ 
++
+ if env['DEBUG'] == 1:
+     env.Append(CCFLAGS=" ".join (debug_flags))
+     env.Append(LINKFLAGS=" ".join (debug_flags))

Added: trunk/overlays/proaudio/media-sound/ardour/files/ardour-2.4-gcc43.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/files/ardour-2.4-gcc43.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/ardour/files/ardour-2.4-gcc43.patch	2008-05-03 12:19:31 UTC (rev 1214)
@@ -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
+ {
+ 


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/