rpms/ardour/F-9 ardour-2.6-SConstruct.patch,NONE,1.1
Anthony Green
green at fedoraproject.org
Sat Oct 25 14:53:10 UTC 2008
- Previous message (by thread): rpms/olpcsound/devel csd-comment-termination.patch, NONE, 1.1 jack-pulseaudio.patch, NONE, 1.1 libstdutil-fix.patch, NONE, 1.1 ogg-opcode-fix.patch, NONE, 1.1 rtalsa-sched.patch, NONE, 1.1 sfont-envelope.patch, NONE, 1.1 olpcsound.spec, 1.1, 1.2
- Next message (by thread): rpms/ardour/F-9 ardour.spec,1.17,1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: green
Update of /cvs/pkgs/rpms/ardour/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23270
Added Files:
ardour-2.6-SConstruct.patch
Log Message:
Add missing file.
ardour-2.6-SConstruct.patch:
--- NEW FILE ardour-2.6-SConstruct.patch ---
--- SConstruct.Sconstruct 2008-10-23 12:06:48.000000000 -0700
+++ SConstruct 2008-10-25 05:38:18.000000000 -0700
@@ -49,6 +49,7 @@
BoolOption('LIBLO', 'Compile with support for liblo library', 1),
BoolOption('NLS', 'Set to turn on i18n support', 1),
PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'),
+ ('LIBDIR', 'Set librarydir (lib/lib64)', 'lib'),
BoolOption('SURFACES', 'Build support for control surfaces', 1),
BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0),
BoolOption('UNIVERSAL', 'Compile as universal binary. Requires that external libraries are already universal.', 0),
@@ -746,13 +747,6 @@
print "\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be an error, especially if you are a package maintainer)"
# end optimization section
-# handle x86/x86_64 libdir properly
-
-if env['DIST_TARGET'] == 'x86_64':
- env['LIBDIR']='lib64'
-else:
- env['LIBDIR']='lib'
-
#
# a single way to test if we're on OS X
#
@@ -785,18 +779,6 @@
if env['ARCH'] != '':
opt_flags = env['ARCH'].split()
-#
-# prepend boiler plate optimization flags
-#
-
-opt_flags[:0] = [
- "-O3",
- "-fomit-frame-pointer",
- "-ffast-math",
- "-fstrength-reduce",
- "-pipe"
- ]
-
if env['DEBUG'] == 1:
env.Append(CCFLAGS=" ".join (debug_flags))
env.Append(LINKFLAGS=" ".join (debug_flags))
@@ -1070,9 +1052,10 @@
# libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
libraries['soundtouch'] = LibraryInfo()
- libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
- # Comment the previous line and uncomment this for old versions of Debian:
- #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
+ if env['VST'] or not env['RUBBERBAND']:
+ #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
+ # Comment the previous line and uncomment this for Debian:
+ libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
LIBPATH='#libs/appleutility',
@@ -1217,7 +1200,11 @@
# timestretch libraries
#
-timefx_subdirs = ['libs/soundtouch']
+if not env['SYSLIBS'] and (env['VST'] or not env['RUBBERBAND']):
+ timefx_subdirs = ['libs/soundtouch']
+else:
+ timefx_subdirs = [ ]
+
if env['RUBBERBAND']:
timefx_subdirs += ['libs/rubberband']
- Previous message (by thread): rpms/olpcsound/devel csd-comment-termination.patch, NONE, 1.1 jack-pulseaudio.patch, NONE, 1.1 libstdutil-fix.patch, NONE, 1.1 ogg-opcode-fix.patch, NONE, 1.1 rtalsa-sched.patch, NONE, 1.1 sfont-envelope.patch, NONE, 1.1 olpcsound.spec, 1.1, 1.2
- Next message (by thread): rpms/ardour/F-9 ardour.spec,1.17,1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list