| 1 |
ssuominen 11/07/29 07:23:17 |
| 2 |
|
| 3 |
Added: ardour-2.8.11-raptor2.patch |
| 4 |
Log: |
| 5 |
Use raptor2 instead of raptor wrt #375027 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-sound/ardour/files/ardour-2.8.11-raptor2.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/files/ardour-2.8.11-raptor2.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/files/ardour-2.8.11-raptor2.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: ardour-2.8.11-raptor2.patch |
| 16 |
=================================================================== |
| 17 |
http://projects.archlinux.org/svntogit/packages.git/plain/ardour/trunk/raptor2.patch |
| 18 |
|
| 19 |
--- SConstruct |
| 20 |
+++ SConstruct |
| 21 |
@@ -431,7 +431,6 @@ |
| 22 |
'gtk+-2.0' : '2.8.1', |
| 23 |
'libxml-2.0' : '2.6.0', |
| 24 |
'samplerate' : '0.1.0', |
| 25 |
- 'raptor' : '1.4.2', |
| 26 |
'lrdf' : '0.4.0', |
| 27 |
'jack' : '0.109.0', |
| 28 |
'libgnomecanvas-2.0' : '2.0', |
| 29 |
@@ -487,7 +486,10 @@ |
| 30 |
|
| 31 |
libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs') |
| 32 |
|
| 33 |
-conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } ) |
| 34 |
+conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists, |
| 35 |
+ 'CheckPKGVersion' : CheckPKGVersion } |
| 36 |
+ ) |
| 37 |
+ |
| 38 |
|
| 39 |
if conf.CheckPKGExists ('fftw3f'): |
| 40 |
libraries['fftw3f'] = LibraryInfo() |
| 41 |
@@ -501,6 +503,22 @@ |
| 42 |
libraries['aubio'] = LibraryInfo() |
| 43 |
libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio') |
| 44 |
|
| 45 |
+raptorOK = 0 |
| 46 |
+ |
| 47 |
+if conf.CheckPKGExists ('raptor2'): |
| 48 |
+ libraries['raptor'] = LibraryInfo() |
| 49 |
+ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor2') |
| 50 |
+ raptorOK = 1 |
| 51 |
+else: |
| 52 |
+ if conf.CheckPKGExists ('raptor') and conf.CheckPKGVersion (pkg, '1.4.2'): |
| 53 |
+ libraries['raptor'] = LibraryInfo() |
| 54 |
+ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor') |
| 55 |
+ raptorOK = 1 |
| 56 |
+ |
| 57 |
+if raptorOK == 0: |
| 58 |
+ print "Ardour requires either raptor or raptor2 to be available at build time" |
| 59 |
+ Exit (1) |
| 60 |
+ |
| 61 |
env = conf.Finish () |
| 62 |
|
| 63 |
if env['FFT_ANALYSIS']: |
| 64 |
@@ -570,9 +588,6 @@ |
| 65 |
libraries['lrdf'] = LibraryInfo() |
| 66 |
libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf') |
| 67 |
|
| 68 |
-libraries['raptor'] = LibraryInfo() |
| 69 |
-libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor') |
| 70 |
- |
| 71 |
libraries['sndfile'] = LibraryInfo() |
| 72 |
libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs sndfile') |
Archives