| 1 |
ssuominen 11/09/28 19:21:13 |
| 2 |
|
| 3 |
Added: ardour-2.8.12-syslibs.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-sound/ardour/files/ardour-2.8.12-syslibs.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/files/ardour-2.8.12-syslibs.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/files/ardour-2.8.12-syslibs.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: ardour-2.8.12-syslibs.patch |
| 16 |
=================================================================== |
| 17 |
--- SConstruct |
| 18 |
+++ SConstruct |
| 19 |
@@ -891,39 +891,6 @@ |
| 20 |
|
| 21 |
|
| 22 |
# |
| 23 |
-# these are part of the Ardour source tree because they are C++ |
| 24 |
-# |
| 25 |
- |
| 26 |
-libraries['vamp'] = LibraryInfo (LIBS='vampsdk', |
| 27 |
- LIBPATH='#libs/vamp-sdk', |
| 28 |
- CPPPATH='#libs/vamp-sdk') |
| 29 |
-libraries['vamphost'] = LibraryInfo (LIBS='vamphostsdk', |
| 30 |
- LIBPATH='#libs/vamp-sdk', |
| 31 |
- CPPPATH='#libs/vamp-sdk') |
| 32 |
- |
| 33 |
-env['RUBBERBAND'] = False |
| 34 |
- |
| 35 |
-conf = Configure (env) |
| 36 |
- |
| 37 |
-if conf.CheckHeader ('fftw3.h'): |
| 38 |
- env['RUBBERBAND'] = True |
| 39 |
- libraries['rubberband'] = LibraryInfo (LIBS='rubberband', |
| 40 |
- LIBPATH='#libs/rubberband', |
| 41 |
- CPPPATH='#libs/rubberband', |
| 42 |
- CCFLAGS='-DUSE_RUBBERBAND') |
| 43 |
-else: |
| 44 |
- print "" |
| 45 |
- print "-------------------------------------------------------------------------" |
| 46 |
- print "You do not have the FFTW single-precision development package installed." |
| 47 |
- print "This prevents Ardour from using the Rubberband library for timestretching" |
| 48 |
- print "and pitchshifting. It will fall back on SoundTouch for timestretch, and " |
| 49 |
- print "pitchshifting will not be available." |
| 50 |
- print "-------------------------------------------------------------------------" |
| 51 |
- print "" |
| 52 |
- |
| 53 |
-conf.Finish() |
| 54 |
- |
| 55 |
-# |
| 56 |
# Check for libusb |
| 57 |
|
| 58 |
libraries['usb'] = LibraryInfo () |
| 59 |
@@ -1109,10 +1076,22 @@ |
| 60 |
# Comment the previous line and uncomment this for old versions of Debian: |
| 61 |
#libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') |
| 62 |
|
| 63 |
- libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', |
| 64 |
- LIBPATH='#libs/appleutility', |
| 65 |
- CPPPATH='#libs/appleutility') |
| 66 |
+ #libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', |
| 67 |
+ # LIBPATH='#libs/appleutility', |
| 68 |
+ # CPPPATH='#libs/appleutility') |
| 69 |
|
| 70 |
+ env['RUBBERBAND'] = True |
| 71 |
+ env.Append (CXXFLAGS="-DUSE_RUBBERBAND") |
| 72 |
+ libraries['rubberband'] = LibraryInfo() |
| 73 |
+ libraries['rubberband'].ParseConfig ('pkg-config --cflags --libs rubberband') |
| 74 |
+ |
| 75 |
+ libraries['vamp-sdk'] = LibraryInfo() |
| 76 |
+ libraries['vamp-sdk'].ParseConfig ('pkg-config --cflags --libs vamp-sdk') |
| 77 |
+ libraries['vamp'] = LibraryInfo() |
| 78 |
+ libraries['vamp'].ParseConfig ('pkg-config --cflags --libs vamp-sdk') |
| 79 |
+ libraries['vamphost'] = LibraryInfo() |
| 80 |
+ libraries['vamphost'].ParseConfig ('pkg-config --cflags --libs vamp-hostsdk') |
| 81 |
+ |
| 82 |
coredirs = [ |
| 83 |
'templates', |
| 84 |
'manual' |
| 85 |
@@ -1122,7 +1101,6 @@ |
| 86 |
'libs/pbd', |
| 87 |
'libs/midi++2', |
| 88 |
'libs/ardour', |
| 89 |
- 'libs/vamp-sdk', |
| 90 |
'libs/vamp-plugins/', |
| 91 |
# these are unconditionally included but have |
| 92 |
# tests internally to avoid compilation etc |
| 93 |
@@ -1138,8 +1116,7 @@ |
| 94 |
gtk_subdirs = [ |
| 95 |
# 'libs/flowcanvas', |
| 96 |
'libs/gtkmm2ext', |
| 97 |
- 'gtk2_ardour', |
| 98 |
- clearlooks_version |
| 99 |
+ 'gtk2_ardour' |
| 100 |
] |
| 101 |
|
| 102 |
else: |
| 103 |
@@ -1251,9 +1228,9 @@ |
| 104 |
# timestretch libraries |
| 105 |
# |
| 106 |
|
| 107 |
-timefx_subdirs = ['libs/soundtouch'] |
| 108 |
-if env['RUBBERBAND']: |
| 109 |
- timefx_subdirs += ['libs/rubberband'] |
| 110 |
+#timefx_subdirs = ['libs/soundtouch'] |
| 111 |
+#if env['RUBBERBAND']: |
| 112 |
+# timefx_subdirs += ['libs/rubberband'] |
| 113 |
|
| 114 |
# |
| 115 |
# Tools |
| 116 |
@@ -1441,7 +1418,7 @@ |
| 117 |
for subdir in coredirs: |
| 118 |
SConscript (subdir + '/SConscript') |
| 119 |
|
| 120 |
-for sublistdir in [ subdirs, timefx_subdirs, gtk_subdirs, surface_subdirs, tools_subdirs ]: |
| 121 |
+for sublistdir in [ subdirs, gtk_subdirs, surface_subdirs, tools_subdirs ]: |
| 122 |
for subdir in sublistdir: |
| 123 |
SConscript (subdir + '/SConscript') |
Archives