diff options
author | root <root@rshg054.dnsready.net> | 2011-08-02 04:35:55 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2011-08-02 04:35:55 +0000 |
commit | bf35116f9d203dcafce808a6c7b3dd5a0db8afbc (patch) | |
tree | f9551a1d3c67d2113cc5fc5c3f8816bcbaad0540 /extra/ardour/raptor2.patch | |
parent | 1173ff2dba7d0fd3c45f170a5e353a76b7a5da2f (diff) |
Tue Aug 2 04:35:55 UTC 2011
Diffstat (limited to 'extra/ardour/raptor2.patch')
-rw-r--r-- | extra/ardour/raptor2.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/extra/ardour/raptor2.patch b/extra/ardour/raptor2.patch new file mode 100644 index 000000000..fe7cacff3 --- /dev/null +++ b/extra/ardour/raptor2.patch @@ -0,0 +1,57 @@ +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') + |