[SM-Commit] GIT changes to master grimoire by Thomas Orgis (29e8f22c436aec0f5d350e17703bd88ecafac69b)

Thomas Orgis scm at sourcemage.org
Wed Jul 9 17:37:40 EDT 2008


GIT changes to master grimoire by Thomas Orgis <sobukus at sourcemage.org>:

 audio-creation/ardour2/HISTORY     |    3 
 audio-creation/ardour2/gcc43.patch |  642 ++++++++++++++++++++++---------------
 2 files changed, 392 insertions(+), 253 deletions(-)

New commits:
commit 07ebe89b136eca61a4ac4e6a301c3147804e200d
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    ardour2: the complete gcc-4.3 fix

diff --git a/audio-creation/ardour2/HISTORY b/audio-creation/ardour2/HISTORY
index d7a0bd2..4b38593 100644
--- a/audio-creation/ardour2/HISTORY
+++ b/audio-creation/ardour2/HISTORY
@@ -1,3 +1,6 @@
+2008-07-09 Thomas Orgis <sobukus at sourcemage.org>
+	* gcc43.patch: Use the one from http://hoth.amu.edu.pl/~j_roszkowski/ardour24.tar.gz
+
 2008-07-07 Juuso Alasuutari <iuso at sourcemage.org>
 	* DEPENDS: Uncommented optional_depends slv2 now that slv2 0.6.0 is out.
 	* DETAILS, PRE_BUILD: Added quotes around directory variables, changed
diff --git a/audio-creation/ardour2/gcc43.patch b/audio-creation/ardour2/gcc43.patch
index 1125b3e..333577c 100644
--- a/audio-creation/ardour2/gcc43.patch
+++ b/audio-creation/ardour2/gcc43.patch
@@ -1,355 +1,491 @@
-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 @@
- 
- */
+--- ardour-2.4.1/libs/sigc++2/sigc++/signal.h	2008-04-09 23:17:17.000000000 +0200
++++ ardour-2.4.1/libs/sigc++2/sigc++/signal.h-new	2008-05-17 04:38:03.000000000 +0200
+@@ -17,6 +17,12 @@
+   //Compilers, such as SUN Forte C++, that do not allow this also often
+   //do not allow a typedef to have the same name as a class in the typedef's definition.
+   #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
++
++  #ifdef __GNUC__
++    #if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
++      #undef SIGC_TYPEDEF_REDEFINE_ALLOWED
++    #endif
++  #endif
+ #endif
+ 
+ namespace sigc {
+--- ardour-2.4.1/libs/pbd/base_ui.cc	2008-05-17 04:32:22.000000000 +0200
++++ ardour-2.4.1/libs/pbd/base_ui.cc-new	2008-05-17 04:32:38.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <cstring>
  
+ #include <pbd/base_ui.h>
+ #include <pbd/error.h>
+--- ardour-2.4.1/libs/pbd/mountpoint.cc	2008-05-17 04:43:57.000000000 +0200
++++ ardour-2.4.1/libs/pbd/mountpoint.cc-new	2008-05-17 04:43:28.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <cstdio>
+ #include <string>
+ #include <limits.h>
 +#include <cstring>
+ 
+ #include <pbd/mountpoint.h>
+ 
+--- ardour-2.4.1/libs/pbd/pathscanner.cc	2008-04-09 23:17:27.000000000 +0200
++++ ardour-2.4.1/libs/pbd/pathscanner.cc-new	2008-05-17 04:45:32.000000000 +0200
+@@ -22,6 +22,7 @@
+ #include <cstdio>
  #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 <dirent.h>
++#include <cstring>
  
- */
+ #include <pbd/error.h>
+ #include <pbd/pathscanner.h>
+--- ardour-2.4.1/libs/pbd/pool.cc	2008-04-09 23:17:27.000000000 +0200
++++ ardour-2.4.1/libs/pbd/pool.cc-new	2008-05-17 04:47:44.000000000 +0200
+@@ -20,6 +20,8 @@
+ 
+ #include <iostream>
+ #include <vector>
++#include <cstring>
++#include <cstdlib>
  
--#include <string>
+ #include <pbd/pool.h>
+ #include <pbd/error.h>
+--- ardour-2.4.1/libs/glibmm2/glibmm/propertyproxy_base.cc	2008-04-09 23:17:08.000000000 +0200
++++ ardour-2.4.1/libs/glibmm2/glibmm/propertyproxy_base.cc-new	2008-05-17 05:00:28.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include <glibmm/signalproxy_connectionnode.h>
+ #include <glibmm/object.h>
+ #include <glibmm/private/object_p.h>
 +#include <cstring>
  
- #include "editing.h"
+ namespace Glib
+ {
+--- ardour-2.4.1/libs/midi++2/fd_midiport.cc	2008-04-09 23:17:09.000000000 +0200
++++ ardour-2.4.1/libs/midi++2/fd_midiport.cc-new	2008-05-17 05:03:51.000000000 +0200
+@@ -20,6 +20,7 @@
  
-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
+ #include <fcntl.h>
+ #include <cerrno>
++#include <cstring>
+ 
+ #include <pbd/error.h>
+ #include <pbd/pathscanner.h>
+--- ardour-2.4.1/libs/midi++2/midi.cc	2008-05-17 05:06:26.000000000 +0200
++++ ardour-2.4.1/libs/midi++2/midi.cc-new	2008-05-17 05:06:32.000000000 +0200
 @@ -21,6 +21,7 @@
- #include <fft_result.h>
- #include <fft_graph.h>
+ #include <string>
  #include <cstdlib>
+ #include <midi++/types.h>
++#include <cstring>
+ 
+ const char *MIDI::controller_names[] = {
+ 	"bank (0)",
+--- ardour-2.4.1/libs/midi++2/midichannel.cc	2008-04-09 23:17:09.000000000 +0200
++++ ardour-2.4.1/libs/midi++2/midichannel.cc-new	2008-05-17 05:08:05.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <midi++/types.h>
+ #include <midi++/port.h>
+ #include <midi++/channel.h>
 +#include <cstring>
+ 
+ using namespace sigc;
+ using namespace MIDI;
+--- ardour-2.4.1/libs/midi++2/midiport.cc	2008-04-09 23:17:09.000000000 +0200
++++ ardour-2.4.1/libs/midi++2/midiport.cc-new	2008-05-17 05:09:07.000000000 +0200
+@@ -20,6 +20,7 @@
+ #include <iostream>
+ #include <cstdio>
+ #include <fcntl.h>
++#include <cstring>
+ 
+ #include <pbd/xml++.h>
+ #include <pbd/failed_constructor.h>
+--- ardour-2.4.1/libs/midi++2/midiparser.cc	2008-04-09 23:17:09.000000000 +0200
++++ ardour-2.4.1/libs/midi++2/midiparser.cc-new	2008-05-17 05:10:24.000000000 +0200
+@@ -26,6 +26,7 @@
  #include <string>
- #include <cmath>
+ #include <iostream>
+ #include <iterator>
++#include <cstring>
  
-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
+ #include <midi++/types.h>
+ #include <midi++/parser.h>
+--- ardour-2.4.1/libs/midi++2/mtc.cc	2008-04-09 23:17:09.000000000 +0200
++++ ardour-2.4.1/libs/midi++2/mtc.cc-new	2008-05-17 05:11:28.000000000 +0200
 @@ -22,6 +22,7 @@
- #define _XOPEN_SOURCE 600
- #include <cstdlib> // for posix_memalign
- #include <cassert>
+ #include <unistd.h>
+ #include <string>
+ #include <iostream>
 +#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 <midi++/types.h>
+ #include <midi++/parser.h>
+--- ardour-2.4.1/libs/ardour/audioanalyser.cc	2008-04-09 23:17:16.000000000 +0200
++++ ardour-2.4.1/libs/ardour/audioanalyser.cc-new	2008-05-17 05:12:45.000000000 +0200
+@@ -2,6 +2,7 @@
+ #include <glibmm/miscutils.h>
+ #include <glibmm/fileutils.h>
+ #include <glib/gstdio.h> // for g_remove()
++#include <cstring>
  
+ #include <pbd/error.h>
+ 
+--- ardour-2.4.1/libs/ardour/audio_diskstream.cc	2008-04-09 23:17:16.000000000 +0200
++++ ardour-2.4.1/libs/ardour/audio_diskstream.cc-new	2008-05-17 05:13:15.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include <ctime>
+ #include <sys/stat.h>
+ #include <sys/mman.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 <pbd/error.h>
+ #include <pbd/basename.h>
+--- ardour-2.4.1/libs/ardour/audioengine.cc	2008-04-09 23:17:16.000000000 +0200
++++ ardour-2.4.1/libs/ardour/audioengine.cc-new	2008-05-17 05:16:15.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <cerrno>
+ #include <vector>
+ #include <sstream>
++#include <cstring>
+ 
+ #include <glibmm/timer.h>
+ #include <pbd/pthread_utils.h>
+--- ardour-2.4.1/libs/ardour/ardour/buffer.h	2008-04-09 23:17:13.000000000 +0200
++++ ardour-2.4.1/libs/ardour/ardour/buffer.h-new	2008-05-17 05:15:12.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include <cassert>
+ #include <ardour/types.h>
+ #include <ardour/data_type.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>
  
+--- ardour-2.4.1/libs/ardour/ardour/port.h	2008-04-09 23:17:12.000000000 +0200
++++ ardour-2.4.1/libs/ardour/ardour/port.h-new	2008-05-17 05:15:49.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include <pbd/failed_constructor.h>
+ #include <ardour/ardour.h>
+ #include <jack/jack.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
+ namespace ARDOUR {
+ 
+--- ardour-2.4.1/libs/ardour/audiofilesource.cc	2008-04-09 23:17:16.000000000 +0200
++++ ardour-2.4.1/libs/ardour/audiofilesource.cc-new	2008-05-17 05:18:07.000000000 +0200
 @@ -18,6 +18,7 @@
  */
  
- #include <cerrno>
+ #include <vector>
 +#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
+ 
+ #include <sys/time.h>
+ #include <sys/stat.h>
+--- ardour-2.4.1/libs/ardour/audiofilter.cc	2008-04-09 23:17:16.000000000 +0200
++++ ardour-2.4.1/libs/ardour/audiofilter.cc-new	2008-05-17 05:18:25.000000000 +0200
 @@ -19,6 +19,7 @@
  
+ #include <time.h>
  #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
+ #include <pbd/basename.h>
+ #include <ardour/sndfilesource.h>
+--- ardour-2.4.1/libs/ardour/audio_playlist.cc	2008-04-09 23:17:16.000000000 +0200
++++ ardour-2.4.1/libs/ardour/audio_playlist.cc-new	2008-05-17 05:20:08.000000000 +0200
 @@ -20,6 +20,7 @@
+ #include <algorithm>
  
- #include <fcntl.h>
- #include <cerrno>
+ #include <cstdlib>
 +#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: midi.cc 4 2005-05-13 20:47:18Z taybin $
- */
+ #include <sigc++/bind.h>
  
--#include <string>
-+#include <cstring>
- #include <cstdlib>
- #include <midi++/types.h>
+--- ardour-2.4.1/libs/ardour/audioregion.cc	2008-04-09 23:17:16.000000000 +0200
++++ ardour-2.4.1/libs/ardour/audioregion.cc-new	2008-05-17 05:20:25.000000000 +0200
+@@ -24,6 +24,8 @@
  
-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: midichannel.cc 4 2005-05-13 20:47:18Z taybin $
- */
+ #include <set>
  
 +#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 <sigc++/bind.h>
+ #include <sigc++/class_slot.h>
  
- #include <cstdlib>
- #include <unistd.h>
--#include <string>
+--- ardour-2.4.1/libs/ardour/ardour/route.h	2008-04-09 23:17:12.000000000 +0200
++++ ardour-2.4.1/libs/ardour/ardour/route.h-new	2008-05-17 05:22:02.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include <set>
+ #include <map>
+ #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 <boost/shared_ptr.hpp>
  
- #include <cstdlib>
+--- ardour-2.4.1/libs/ardour/audiosource.cc	2008-04-09 23:17:16.000000000 +0200
++++ ardour-2.4.1/libs/ardour/audiosource.cc-new	2008-05-17 05:22:13.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <fstream>
+ #include <algorithm>
+ #include <vector>
++#include <cstring>
+ 
+ #include <glibmm/fileutils.h>
+ #include <glibmm/miscutils.h>
+--- ardour-2.4.1/libs/ardour/crossfade.cc	2008-04-09 23:17:16.000000000 +0200
++++ ardour-2.4.1/libs/ardour/crossfade.cc-new	2008-05-17 05:27:25.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <ardour/playlist.h>
+ #include <ardour/utils.h>
+ #include <ardour/session.h>
++#include <cstring>
+ 
+ #include "i18n.h"
+ #include <locale.h>
+--- ardour-2.4.1/libs/ardour/panner.cc	2008-04-09 23:17:16.000000000 +0200
++++ ardour-2.4.1/libs/ardour/panner.cc-new	2008-05-17 05:29:52.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include <locale.h>
  #include <unistd.h>
--#include <string>
+ #include <float.h>
 +#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 <glibmm.h>
+ 
+--- ardour-2.4.1/libs/ardour/recent_sessions.cc	2008-04-09 23:17:16.000000000 +0200
++++ ardour-2.4.1/libs/ardour/recent_sessions.cc-new	2008-05-17 05:31:23.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include <ardour/recent_sessions.h>
+ #include <ardour/utils.h>
+ #include "i18n.h"
++#include <cstring>
+ 
+ using namespace std;
+ using namespace ARDOUR;
+--- ardour-2.4.1/libs/ardour/redirect.cc	2008-04-09 23:17:16.000000000 +0200
++++ ardour-2.4.1/libs/ardour/redirect.cc-new	2008-05-17 05:31:33.000000000 +0200
+@@ -23,6 +23,7 @@
+ #include <cerrno>
  #include <unistd.h>
- #include <fcntl.h>
--#include <errno.h>
-+#include <cerrno>
+ #include <sstream>
 +#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
+ #include <sigc++/bind.h>
+ 
+--- ardour-2.4.1/libs/ardour/session_click.cc	2008-04-09 23:17:16.000000000 +0200
++++ ardour-2.4.1/libs/ardour/session_click.cc-new	2008-05-17 05:33:53.000000000 +0200
 @@ -19,6 +19,7 @@
- */
  
- #include <cstdio>
+ #include <list>
+ #include <cerrno>
 +#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 <ardour/ardour.h>
+ #include <ardour/session.h>
+--- ardour-2.4.1/libs/ardour/ardour/silentfilesource.h	2008-04-09 23:17:12.000000000 +0200
++++ ardour-2.4.1/libs/ardour/ardour/silentfilesource.h-new	2008-05-17 05:36:42.000000000 +0200
+@@ -21,6 +21,7 @@
+ #define __ardour_silentfilesource_h__
  
- #include <cstdlib>
- #include <cstdio>
+ #include <ardour/audiofilesource.h>
 +#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
+ namespace ARDOUR {
  
-+#include <cstring>
- #include <glib.h>
+--- ardour-2.4.1/libs/ardour/sndfilesource.cc	2008-04-09 23:17:16.000000000 +0200
++++ ardour-2.4.1/libs/ardour/sndfilesource.cc-new	2008-05-17 05:37:56.000000000 +0200
+@@ -19,6 +19,7 @@
  
- 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: pool.cc 2117 2007-07-06 03:11:52Z paul $
- */
+ #include <cerrno>
+ #include <climits>
++#include <cstring>
  
-+#include <cstdlib>
+ #include <pwd.h>
+ #include <sys/utsname.h>
+--- ardour-2.4.1/libs/ardour/utils.cc	2008-04-09 23:17:16.000000000 +0200
++++ ardour-2.4.1/libs/ardour/utils.cc-new	2008-05-17 05:39:39.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <cmath>
+ #include <cctype>
+ #include <string>
++#include <cstring>
+ #include <cerrno>
  #include <iostream>
+ #include <sys/types.h>
+--- ardour-2.4.1/libs/vamp-sdk/vamp-sdk/Plugin.h	2008-04-09 23:17:05.000000000 +0200
++++ ardour-2.4.1/libs/vamp-sdk/vamp-sdk/Plugin.h-new	2008-05-17 05:42:02.000000000 +0200
+@@ -43,6 +43,8 @@
+ #include <string>
  #include <vector>
+ #include <map>
++#include <cstring>
++#include <cstdlib>
  
-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>
+ namespace Vamp {
  
-+#include <cstdlib>
+--- ardour-2.4.1/libs/rubberband/src/Window.h	2008-04-09 23:17:28.000000000 +0200
++++ ardour-2.4.1/libs/rubberband/src/Window.h-new	2008-05-17 05:47:46.000000000 +0200
+@@ -18,6 +18,7 @@
  #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 <cstdlib>
  
- #include "RubberBandStretcher.h"
+ namespace RubberBand {
  
-+#include <cstdlib>
-+#include <cstring>
+--- ardour-2.4.1/libs/rubberband/src/RingBuffer.h	2008-04-09 23:17:28.000000000 +0200
++++ ardour-2.4.1/libs/rubberband/src/RingBuffer.h-new	2008-05-17 05:49:21.000000000 +0200
+@@ -37,6 +37,8 @@
  #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_
+ #endif
  
 +#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 @@
++
+ namespace RubberBand {
  
- #include "StretchCalculator.h"
+ /**
+--- ardour-2.4.1/libs/rubberband/src/Thread.cpp	2008-04-09 23:17:28.000000000 +0200
++++ ardour-2.4.1/libs/rubberband/src/Thread.cpp-new	2008-05-17 05:50:37.000000000 +0200
+@@ -15,6 +15,7 @@
+ #include "Thread.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 <cstdlib>
  
+ #include <sys/time.h>
+ #include <time.h>
+--- ardour-2.4.1/libs/rubberband/src/main.cpp	2008-04-09 23:17:28.000000000 +0200
++++ ardour-2.4.1/libs/rubberband/src/main.cpp-new	2008-05-17 05:51:47.000000000 +0200
+@@ -17,6 +17,8 @@
  #include <iostream>
- 
+ #include <sndfile.h>
+ #include <cmath>
 +#include <cstdlib>
++#include <cstring>
  #include <sys/time.h>
  #include <time.h>
+ #include "sysutils.h"
+--- ardour-2.4.1/libs/rubberband/src/StretchCalculator.cpp	2008-04-09 23:17:28.000000000 +0200
++++ ardour-2.4.1/libs/rubberband/src/StretchCalculator.cpp-new	2008-05-17 05:55:09.000000000 +0200
+@@ -19,6 +19,7 @@
+ #include <deque>
+ #include <set>
+ #include <cassert>
++#include <algorithm>
  
-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>
+ namespace RubberBand
+ {
+--- ardour-2.4.1/libs/rubberband/src/FFT.cpp	2008-04-09 23:17:28.000000000 +0200
++++ ardour-2.4.1/libs/rubberband/src/FFT.cpp-new	2008-05-17 05:56:14.000000000 +0200
+@@ -23,6 +23,7 @@
  #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 <cstdio>
+ #include <vector>
++#include <cstdlib>
  
- #include <tranzport_control_protocol.h>
+ namespace RubberBand {
+ 
+--- ardour-2.4.1/gtk2_ardour/actions.cc	2008-04-09 23:17:02.000000000 +0200
++++ ardour-2.4.1/gtk2_ardour/actions.cc-new	2008-05-17 06:00:15.000000000 +0200
+@@ -20,6 +20,7 @@
+ #include <vector>
+ #include <string>
+ #include <list>
 +#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 <gtk/gtkaccelmap.h>
+ #include <gtk/gtkuimanager.h>
+--- ardour-2.4.1/gtk2_ardour/ardour_ui_options.cc	2008-04-09 23:17:02.000000000 +0200
++++ ardour-2.4.1/gtk2_ardour/ardour_ui_options.cc-new	2008-05-17 06:03:44.000000000 +0200
+@@ -19,6 +19,7 @@
  
- #include <fstream>
- #include <cctype> // tolower
+ #include <pbd/convert.h>
+ #include <pbd/stacktrace.h>
 +#include <cstring>
  
- #ifdef _WIN32
+ #include <gtkmm2ext/utils.h>
  
-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 @@
+--- ardour-2.4.1/gtk2_ardour/editing.h	2008-04-09 23:17:02.000000000 +0200
++++ ardour-2.4.1/gtk2_ardour/editing.h-new	2008-05-17 06:10:46.000000000 +0200
+@@ -21,6 +21,7 @@
+ #define __gtk_ardour_editing_h__
  
- #include "PluginAdapter.h"
+ #include <string>
++#include <cstring>
+ #include <map>
+ #include <ardour/types.h>
  
-+#include <cstdlib>
+--- ardour-2.4.1/gtk2_ardour/opts.cc	2008-04-09 23:17:02.000000000 +0200
++++ ardour-2.4.1/gtk2_ardour/opts.cc-new	2008-05-17 11:19:00.000000000 +0200
+@@ -20,6 +20,7 @@
+ #include <getopt.h>
+ #include <iostream>
+ #include <cstdlib>
 +#include <cstring>
-+
- //#define DEBUG_PLUGIN_ADAPTER 1
  
+ #include <ardour/session.h>
  
-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 @@
+--- ardour-2.4.1/gtk2_ardour/fft_result.cc	2008-04-09 23:17:02.000000000 +0200
++++ ardour-2.4.1/gtk2_ardour/fft_result.cc-new	2008-05-17 11:24:50.000000000 +0200
+@@ -23,6 +23,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <cmath>
++#include <cstring>
  
- #include "PluginHostAdapter.h"
+ #include <iostream>
  
-+#include <cstdlib>
+--- ardour-2.4.1/libs/gtkmm2/gtk/gtkmm/scale.cc	2008-05-17 11:36:04.000000000 +0200
++++ ardour-2.4.1/libs/gtkmm2/gtk/gtkmm/scale.cc-new	2008-05-17 11:36:07.000000000 +0200
+@@ -32,6 +32,8 @@
+ #include <gtk/gtkvscale.h>
+ #include <math.h>
+ 
++#include <cstring>
 +
- namespace Vamp
+ namespace Gtk
  {
  
+--- ardour-2.4.1/libs/gtkmm2/gtk/gtkmm/targetentry.cc	2008-04-09 23:17:25.000000000 +0200
++++ ardour-2.4.1/libs/gtkmm2/gtk/gtkmm/targetentry.cc-new	2008-05-17 11:46:19.000000000 +0200
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include <gtkmm/targetentry.h>
++#include <cstring>
+ 
+ 
+ namespace Gtk
+--- ardour-2.4.1/libs/gtkmm2ext/gtk_ui.cc	2008-04-09 23:17:05.000000000 +0200
++++ ardour-2.4.1/libs/gtkmm2ext/gtk_ui.cc-new	2008-05-17 11:50:35.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include <cerrno>
+ #include <climits>
+ #include <cctype>
++#include <cstring>
+ 
+ #include <gtkmm.h>
+ #include <pbd/error.h>
+--- ardour-2.4.1/libs/surfaces/tranzport/screen.cc	2008-04-09 23:17:32.000000000 +0200
++++ ardour-2.4.1/libs/surfaces/tranzport/screen.cc-new	2008-05-17 11:56:10.000000000 +0200
+@@ -19,6 +19,7 @@
+  *   */
+ 
+ #include <tranzport_control_protocol.h>
++#include <cstring>
+ 
+ void
+ TranzportControlProtocol::screen_clear ()
+--- ardour-2.4.1/libs/surfaces/mackie/mackie_control_protocol_poll.cc	2008-04-09 23:17:34.000000000 +0200
++++ ardour-2.4.1/libs/surfaces/mackie/mackie_control_protocol_poll.cc-new	2008-05-17 12:03:43.000000000 +0200
+@@ -19,6 +19,7 @@
+ #include <iostream>
+ #include <string>
+ #include <vector>
++#include <cstring>
+ 
+ using namespace std;
+ using namespace Mackie;



More information about the SM-Commit mailing list