1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
http://projects.archlinux.org/svntogit/packages.git/plain/ardour/trunk/raptor2.patch
--- SConstruct
+++ SConstruct
@@ -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')
|
GitWeb
