Mon Oct 17 14:16:38 UTC 2011

2 files changed, 0 insertions, 99 deletions

diff --git a/extra/ardour/gcc46.patch b/extra/ardour/gcc46.patch
deleted file mode 100644
index d01610d1d..000000000
--- a/extra/ardour/gcc46.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -rupN ardour-2.8.11.old/libs/ardour/enums.cc ardour-2.8.11/libs/ardour/enums.cc
---- ardour-2.8.11.old/libs/ardour/enums.cc	2010-04-20 13:28:37.000000000 -0400
-+++ ardour-2.8.11/libs/ardour/enums.cc	2011-02-13 11:23:02.000000000 -0500
-@@ -31,7 +31,8 @@
- 
- using namespace std;
- using namespace PBD;
--using namespace ARDOUR;
-+namespace ARDOUR
-+{
- 
- void
- setup_enum_writer ()
-@@ -362,3 +363,5 @@ setup_enum_writer ()
- 	REGISTER (_Track_FreezeState);
- 	
- }
-+
-+}
-diff -rupN ardour-2.8.11.old/libs/rubberband/rubberband/RubberBandStretcher.h ardour-2.8.11/libs/rubberband/rubberband/RubberBandStretcher.h
---- ardour-2.8.11.old/libs/rubberband/rubberband/RubberBandStretcher.h	2009-03-26 10:25:40.000000000 -0400
-+++ ardour-2.8.11/libs/rubberband/rubberband/RubberBandStretcher.h	2011-02-09 21:41:04.000000000 -0500
-@@ -19,6 +19,7 @@
- #define RUBBERBAND_API_MAJOR_VERSION 2
- #define RUBBERBAND_API_MINOR_VERSION 0
- 
-+#include <cstddef>
- #include <vector>
- 
- /**
-diff -rupN ardour-2.8.11.old/libs/surfaces/wiimote/wiimote.cc ardour-2.8.11/libs/surfaces/wiimote/wiimote.cc
---- ardour-2.8.11.old/libs/surfaces/wiimote/wiimote.cc	2009-02-24 07:38:19.000000000 -0500
-+++ ardour-2.8.11/libs/surfaces/wiimote/wiimote.cc	2011-02-13 11:23:24.000000000 -0500
-@@ -177,7 +177,7 @@ wiimote_discovery:
- 	std::cerr << "Wiimote: discovering, press 1+2" << std::endl;
- 
-  	while (!wiimote_handle && !main_thread_quit) {
--		bdaddr = *BDADDR_ANY;
-+		bdaddr = (bdaddr_t) {{0, 0, 0, 0, 0, 0}};
- 		callback_thread_registered_for_ardour = false;
- 		wiimote_handle = cwiid_open(&bdaddr, 0);
- 
diff --git a/extra/ardour/raptor2.patch b/extra/ardour/raptor2.patch
deleted file mode 100644
index fe7cacff3..000000000
--- a/extra/ardour/raptor2.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: SConstruct
-===================================================================
---- SConstruct	(revision 9877)
-+++ SConstruct	(revision 9878)
-@@ -431,7 +431,6 @@
- 	'gtk+-2.0'             : '2.8.1',
- 	'libxml-2.0'           : '2.6.0',
- 	'samplerate'           : '0.1.0',
--	'raptor'               : '1.4.2',
- 	'lrdf'                 : '0.4.0',
- 	'jack'                 : '0.109.0',
- 	'libgnomecanvas-2.0'   : '2.0',
-@@ -487,7 +486,10 @@
- 
- libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs')
- 
--conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } )
-+conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists,
-+                                       'CheckPKGVersion' : CheckPKGVersion }
-+                      )
-+                      
- 
- if conf.CheckPKGExists ('fftw3f'):
-     libraries['fftw3f'] = LibraryInfo()
-@@ -501,6 +503,22 @@
-     libraries['aubio'] = LibraryInfo()
-     libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio')
- 
-+raptorOK = 0
-+
-+if conf.CheckPKGExists ('raptor2'):
-+    libraries['raptor'] = LibraryInfo()
-+    libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor2')
-+    raptorOK = 1
-+else:
-+    if conf.CheckPKGExists ('raptor') and conf.CheckPKGVersion (pkg, '1.4.2'):
-+        libraries['raptor'] = LibraryInfo()
-+        libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor')
-+        raptorOK = 1
-+            
-+if raptorOK == 0:
-+    print "Ardour requires either raptor or raptor2 to be available at build time"
-+    Exit (1)
-+
- env = conf.Finish ()
- 
- if env['FFT_ANALYSIS']:
-@@ -570,9 +588,6 @@
- libraries['lrdf'] = LibraryInfo()
- libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf')
- 
--libraries['raptor'] = LibraryInfo()
--libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor')
--
- libraries['sndfile'] = LibraryInfo()
- libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs sndfile')
-