rpms/ardour/devel ardour-2.6-SConstruct.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 ardour.spec, 1.17, 1.18 sources, 1.7, 1.8 ardour-2.1-SConstruct.patch, 1.3, NONE
Anthony Green
green at fedoraproject.org
Sat Oct 25 13:47:25 UTC 2008
Author: green
Update of /cvs/pkgs/rpms/ardour/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12166
Modified Files:
.cvsignore ardour.spec sources
Added Files:
ardour-2.6-SConstruct.patch
Removed Files:
ardour-2.1-SConstruct.patch
Log Message:
Upgrade to 2.6.
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']
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 14 Jul 2008 06:19:44 -0000 1.7
+++ .cvsignore 25 Oct 2008 13:46:55 -0000 1.8
@@ -1 +1 @@
-ardour-2.5.tar.bz2
+ardour-2.6-4004.tar.bz2
Index: ardour.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/devel/ardour.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ardour.spec 21 Sep 2008 16:04:31 -0000 1.17
+++ ardour.spec 25 Oct 2008 13:46:55 -0000 1.18
@@ -1,16 +1,14 @@
Summary: Multichannel Digital Audio Workstation
Name: ardour
-Version: 2.5
-Release: 2%{?dist}
-Source: http://ardour.org/files/releases/ardour-%{version}.tar.bz2
+Version: 2.6
+Release: 1%{?dist}
+Source: http://ardour.org/files/releases/ardour-%{version}-4004.tar.bz2
Source1: ardour2.desktop
Source2: ardour.script
-Patch0: ardour-2.1-SConstruct.patch
+Patch0: ardour-2.6-SConstruct.patch
Patch1: ardour-session.cc-no_stomp.patch
Patch2: ardour-2.5-gcc43.patch
-#Patch2: ardour-session.cc-_total_free_4k_blocks.patch
-#Patch3: ardour-2.4-gcc43.patch
-Patch4: ardour-2.5-HOST_NOT_FOUND.patch
+Patch3: ardour-2.5-HOST_NOT_FOUND.patch
URL: http://ardour.org
License: GPLv2+
Group: Applications/Multimedia
@@ -54,11 +52,10 @@
%prep
%setup -q
-%patch0 -p1
+%patch0 -p0 -b .Sconstruct
%patch1 -p0
%patch2 -p0
-%patch4 -p0
-#%patch3 -p1
+%patch3 -p0
for i in README.fr README.it TRANSLATORS; do
iconv -f ISO-8859-1 -t UTF8 DOCUMENTATION/$i > DOCUMENTATION/$i.tmp
mv DOCUMENTATION/$i.tmp DOCUMENTATION/$i
@@ -80,6 +77,7 @@
%endif
scons %{?_smp_mflags} PREFIX=%{_prefix} LIBDIR=%{_lib} SYSLIBS=1 \
+ FREESOUND=1 \
DIST_TARGET="${TARGETCPU}" \
ARCH="$RPM_OPT_FLAGS $ARCH_FLAGS -ffast-math"
@@ -146,6 +144,10 @@
%{_datadir}/applications/fedora-ardour2.desktop
%changelog
+* Sat Oct 25 2008 Anthony Green <green at redhat.com> 2.6-1
+- New upstream release 2.6.
+- Update SConstruct patch.
+
* Sun Sep 21 2008 Anthony Green <green at redhat.com> 2.5-2
- Add HOST_NOT_FOUND patch.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 14 Jul 2008 06:19:44 -0000 1.7
+++ sources 25 Oct 2008 13:46:55 -0000 1.8
@@ -1 +1 @@
-88180d400e8c19ceea41aabadc098116 ardour-2.5.tar.bz2
+0ff3da07f9b283b10927f35343de765b ardour-2.6-4004.tar.bz2
--- ardour-2.1-SConstruct.patch DELETED ---
More information about the scm-commits
mailing list