rpms/ardour/F-8 ardour-2.1-SConstruct.patch, 1.3, 1.4 ardour-2.4-gcc43.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 ardour.spec, 1.14, 1.15 sources, 1.5, 1.6 ardour-2.3-SConstruct.patch, 1.2, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Wed Apr 9 18:13:20 UTC 2008
Author: jwrdegoede
Update of /cvs/extras/rpms/ardour/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21593
Modified Files:
.cvsignore ardour.spec sources
Added Files:
ardour-2.1-SConstruct.patch ardour-2.4-gcc43.patch
Removed Files:
ardour-2.3-SConstruct.patch
Log Message:
sync F-8 with devel, this diff will look strange as F-8 got some updates which devel didn't get (bad), but with devel now bumped to 2.4, devel really is the latest, sorry about the mess
ardour-2.1-SConstruct.patch:
Index: ardour-2.1-SConstruct.patch
===================================================================
RCS file: ardour-2.1-SConstruct.patch
diff -N ardour-2.1-SConstruct.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ardour-2.1-SConstruct.patch 9 Apr 2008 18:13:06 -0000 1.4
@@ -0,0 +1,73 @@
+diff -up ardour-2.4/SConstruct.orig ardour-2.4/SConstruct
+--- ardour-2.4/SConstruct.orig 2008-03-31 23:53:54.000000000 +0200
++++ ardour-2.4/SConstruct 2008-04-07 10:05:55.000000000 +0200
+@@ -45,6 +45,7 @@ opts.AddOptions(
+ 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),
+@@ -735,13 +736,6 @@ if env['FPU_OPTIMIZATION']:
+ 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
+ #
+@@ -767,18 +761,6 @@ env.Append(CONFIG_ARCH=config[config_arc
+ 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))
+@@ -1031,10 +1031,12 @@ if env['SYSLIBS']:
+ # libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4')
+
+ # 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 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',
+@@ -1177,7 +1177,11 @@ else:
+ # 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']
+
ardour-2.4-gcc43.patch:
--- NEW FILE ardour-2.4-gcc43.patch ---
diff -up ardour-2.4/gtk2_ardour/actions.cc.gcc43 ardour-2.4/gtk2_ardour/actions.cc
--- ardour-2.4/gtk2_ardour/actions.cc.gcc43 2008-03-31 08:07:53.000000000 -0400
+++ ardour-2.4/gtk2_ardour/actions.cc 2008-04-05 15:29:00.000000000 -0400
@@ -17,6 +17,7 @@
*/
+#include <cstring>
#include <vector>
#include <string>
#include <list>
diff -up ardour-2.4/gtk2_ardour/editing.cc.gcc43 ardour-2.4/gtk2_ardour/editing.cc
--- ardour-2.4/gtk2_ardour/editing.cc.gcc43 2008-04-05 15:34:10.000000000 -0400
+++ ardour-2.4/gtk2_ardour/editing.cc 2008-04-05 15:34:21.000000000 -0400
@@ -17,7 +17,7 @@
*/
-#include <string>
+#include <cstring>
#include "editing.h"
diff -up ardour-2.4/gtk2_ardour/editing_syms.h.gcc43 ardour-2.4/gtk2_ardour/editing_syms.h
diff -up ardour-2.4/gtk2_ardour/fft_result.cc.gcc43 ardour-2.4/gtk2_ardour/fft_result.cc
--- ardour-2.4/gtk2_ardour/fft_result.cc.gcc43 2008-04-05 16:47:41.000000000 -0400
+++ ardour-2.4/gtk2_ardour/fft_result.cc 2008-04-05 16:53:14.000000000 -0400
@@ -21,6 +21,7 @@
#include <fft_result.h>
#include <fft_graph.h>
#include <cstdlib>
+#include <cstring>
#include <string>
#include <cmath>
diff -up ardour-2.4/libs/ardour/ardour/buffer.h.gcc43 ardour-2.4/libs/ardour/ardour/buffer.h
--- ardour-2.4/libs/ardour/ardour/buffer.h.gcc43 2007-05-10 07:30:33.000000000 -0400
+++ ardour-2.4/libs/ardour/ardour/buffer.h 2008-04-05 15:29:00.000000000 -0400
@@ -22,6 +22,7 @@
#define _XOPEN_SOURCE 600
#include <cstdlib> // for posix_memalign
#include <cassert>
+#include <cstring>
#include <ardour/types.h>
#include <ardour/data_type.h>
diff -up ardour-2.4/libs/ardour/ardour/port.h.gcc43 ardour-2.4/libs/ardour/ardour/port.h
--- ardour-2.4/libs/ardour/ardour/port.h.gcc43 2007-05-10 07:30:33.000000000 -0400
+++ ardour-2.4/libs/ardour/ardour/port.h 2008-04-05 15:29:00.000000000 -0400
@@ -20,6 +20,7 @@
#ifndef __ardour_port_h__
#define __ardour_port_h__
+#include <cstring>
#include <sigc++/signal.h>
#include <pbd/failed_constructor.h>
#include <ardour/ardour.h>
diff -up ardour-2.4/libs/ardour/ardour/silentfilesource.h.gcc43 ardour-2.4/libs/ardour/ardour/silentfilesource.h
--- ardour-2.4/libs/ardour/ardour/silentfilesource.h.gcc43 2008-01-30 15:29:38.000000000 -0500
+++ ardour-2.4/libs/ardour/ardour/silentfilesource.h 2008-04-05 15:29:00.000000000 -0400
@@ -20,6 +20,7 @@
#ifndef __ardour_silentfilesource_h__
#define __ardour_silentfilesource_h__
+#include <cstring>
#include <ardour/audiofilesource.h>
namespace ARDOUR {
diff -up ardour-2.4/libs/ardour/audioanalyser.cc.gcc43 ardour-2.4/libs/ardour/audioanalyser.cc
--- ardour-2.4/libs/ardour/audioanalyser.cc.gcc43 2008-02-16 16:52:28.000000000 -0500
+++ ardour-2.4/libs/ardour/audioanalyser.cc 2008-04-05 15:29:00.000000000 -0400
@@ -9,6 +9,8 @@
#include <ardour/readable.h>
#include <ardour/readable.h>
+#include <cstring>
+
#include "i18n.h"
using namespace std;
diff -up ardour-2.4/libs/ardour/recent_sessions.cc.gcc43 ardour-2.4/libs/ardour/recent_sessions.cc
--- ardour-2.4/libs/ardour/recent_sessions.cc.gcc43 2008-01-29 13:21:54.000000000 -0500
+++ ardour-2.4/libs/ardour/recent_sessions.cc 2008-04-05 15:29:00.000000000 -0400
@@ -18,6 +18,7 @@
*/
#include <cerrno>
+#include <cstring>
#include <unistd.h>
#include <fstream>
#include <algorithm>
diff -up ardour-2.4/libs/ardour/sndfilesource.cc.gcc43 ardour-2.4/libs/ardour/sndfilesource.cc
--- ardour-2.4/libs/ardour/sndfilesource.cc.gcc43 2008-02-27 10:21:21.000000000 -0500
+++ ardour-2.4/libs/ardour/sndfilesource.cc 2008-04-05 15:29:00.000000000 -0400
@@ -19,6 +19,7 @@
#include <cerrno>
#include <climits>
+#include <cstring>
#include <pwd.h>
#include <sys/utsname.h>
diff -up ardour-2.4/libs/ardour/utils.cc.gcc43 ardour-2.4/libs/ardour/utils.cc
--- ardour-2.4/libs/ardour/utils.cc.gcc43 2008-03-26 21:21:32.000000000 -0400
+++ ardour-2.4/libs/ardour/utils.cc 2008-04-05 15:29:00.000000000 -0400
@@ -20,7 +20,7 @@
#include <cstdio> /* for sprintf */
#include <cmath>
#include <cctype>
-#include <string>
+#include <cstring>
#include <cerrno>
#include <iostream>
#include <sys/types.h>
diff -up ardour-2.4/libs/midi++2/fd_midiport.cc.gcc43 ardour-2.4/libs/midi++2/fd_midiport.cc
--- ardour-2.4/libs/midi++2/fd_midiport.cc.gcc43 2007-09-27 00:20:36.000000000 -0400
+++ ardour-2.4/libs/midi++2/fd_midiport.cc 2008-04-05 15:29:00.000000000 -0400
@@ -20,6 +20,7 @@
#include <fcntl.h>
#include <cerrno>
+#include <cstring>
#include <pbd/error.h>
#include <pbd/pathscanner.h>
diff -up ardour-2.4/libs/midi++2/midi.cc.gcc43 ardour-2.4/libs/midi++2/midi.cc
--- ardour-2.4/libs/midi++2/midi.cc.gcc43 2007-05-10 07:30:30.000000000 -0400
+++ ardour-2.4/libs/midi++2/midi.cc 2008-04-05 15:29:00.000000000 -0400
@@ -18,7 +18,7 @@
$Id: midi.cc 4 2005-05-13 20:47:18Z taybin $
*/
-#include <string>
+#include <cstring>
#include <cstdlib>
#include <midi++/types.h>
diff -up ardour-2.4/libs/midi++2/midichannel.cc.gcc43 ardour-2.4/libs/midi++2/midichannel.cc
--- ardour-2.4/libs/midi++2/midichannel.cc.gcc43 2007-05-10 07:30:30.000000000 -0400
+++ ardour-2.4/libs/midi++2/midichannel.cc 2008-04-05 15:29:00.000000000 -0400
@@ -18,6 +18,8 @@
$Id: midichannel.cc 4 2005-05-13 20:47:18Z taybin $
*/
+#include <cstring>
+
#include <midi++/types.h>
#include <midi++/port.h>
#include <midi++/channel.h>
diff -up ardour-2.4/libs/midi++2/midiparser.cc.gcc43 ardour-2.4/libs/midi++2/midiparser.cc
--- ardour-2.4/libs/midi++2/midiparser.cc.gcc43 2007-05-10 07:30:30.000000000 -0400
+++ ardour-2.4/libs/midi++2/midiparser.cc 2008-04-05 15:29:00.000000000 -0400
@@ -23,7 +23,7 @@
#include <cstdlib>
#include <unistd.h>
-#include <string>
+#include <cstring>
#include <iostream>
#include <iterator>
diff -up ardour-2.4/libs/midi++2/mtc.cc.gcc43 ardour-2.4/libs/midi++2/mtc.cc
--- ardour-2.4/libs/midi++2/mtc.cc.gcc43 2007-05-10 07:30:30.000000000 -0400
+++ ardour-2.4/libs/midi++2/mtc.cc 2008-04-05 15:29:00.000000000 -0400
@@ -20,7 +20,7 @@
#include <cstdlib>
#include <unistd.h>
-#include <string>
+#include <cstring>
#include <iostream>
#include <midi++/types.h>
diff -up ardour-2.4/libs/pbd/base_ui.cc.gcc43 ardour-2.4/libs/pbd/base_ui.cc
--- ardour-2.4/libs/pbd/base_ui.cc.gcc43 2007-05-10 07:30:44.000000000 -0400
+++ ardour-2.4/libs/pbd/base_ui.cc 2008-04-05 15:29:00.000000000 -0400
@@ -20,7 +20,8 @@
#include <stdint.h>
#include <unistd.h>
#include <fcntl.h>
-#include <errno.h>
+#include <cerrno>
+#include <cstring>
#include <pbd/base_ui.h>
#include <pbd/error.h>
diff -up ardour-2.4/libs/pbd/mountpoint.cc.gcc43 ardour-2.4/libs/pbd/mountpoint.cc
--- ardour-2.4/libs/pbd/mountpoint.cc.gcc43 2007-09-24 11:42:04.000000000 -0400
+++ ardour-2.4/libs/pbd/mountpoint.cc 2008-04-05 15:29:00.000000000 -0400
@@ -19,6 +19,7 @@
*/
#include <cstdio>
+#include <cstring>
#include <string>
#include <limits.h>
diff -up ardour-2.4/libs/pbd/pathscanner.cc.gcc43 ardour-2.4/libs/pbd/pathscanner.cc
--- ardour-2.4/libs/pbd/pathscanner.cc.gcc43 2007-05-10 07:30:44.000000000 -0400
+++ ardour-2.4/libs/pbd/pathscanner.cc 2008-04-05 15:29:00.000000000 -0400
@@ -20,6 +20,7 @@
#include <cstdlib>
#include <cstdio>
+#include <cstring>
#include <vector>
#include <dirent.h>
diff -up ardour-2.4/libs/pbd/pbd/ringbuffer.h.gcc43 ardour-2.4/libs/pbd/pbd/ringbuffer.h
--- ardour-2.4/libs/pbd/pbd/ringbuffer.h.gcc43 2007-05-10 07:30:44.000000000 -0400
+++ ardour-2.4/libs/pbd/pbd/ringbuffer.h 2008-04-05 15:29:00.000000000 -0400
@@ -20,6 +20,7 @@
#ifndef ringbuffer_h
#define ringbuffer_h
+#include <cstring>
#include <glib.h>
template<class T>
diff -up ardour-2.4/libs/pbd/pool.cc.gcc43 ardour-2.4/libs/pbd/pool.cc
--- ardour-2.4/libs/pbd/pool.cc.gcc43 2007-07-05 23:11:52.000000000 -0400
+++ ardour-2.4/libs/pbd/pool.cc 2008-04-05 15:29:00.000000000 -0400
@@ -18,6 +18,7 @@
$Id: pool.cc 2117 2007-07-06 03:11:52Z paul $
*/
+#include <cstdlib>
#include <iostream>
#include <vector>
diff -up ardour-2.4/libs/rubberband/src/FFT.cpp.gcc43 ardour-2.4/libs/rubberband/src/FFT.cpp
--- ardour-2.4/libs/rubberband/src/FFT.cpp.gcc43 2007-12-11 10:30:32.000000000 -0500
+++ ardour-2.4/libs/rubberband/src/FFT.cpp 2008-04-05 15:29:00.000000000 -0400
@@ -18,6 +18,7 @@
#include <fftw3.h>
+#include <cstdlib>
#include <cmath>
#include <iostream>
#include <map>
diff -up ardour-2.4/libs/rubberband/src/main.cpp.gcc43 ardour-2.4/libs/rubberband/src/main.cpp
--- ardour-2.4/libs/rubberband/src/main.cpp.gcc43 2007-12-11 10:27:07.000000000 -0500
+++ ardour-2.4/libs/rubberband/src/main.cpp 2008-04-05 15:29:00.000000000 -0400
@@ -14,6 +14,8 @@
#include "RubberBandStretcher.h"
+#include <cstdlib>
+#include <cstring>
#include <iostream>
#include <sndfile.h>
#include <cmath>
diff -up ardour-2.4/libs/rubberband/src/RingBuffer.h.gcc43 ardour-2.4/libs/rubberband/src/RingBuffer.h
--- ardour-2.4/libs/rubberband/src/RingBuffer.h.gcc43 2007-12-11 10:27:07.000000000 -0500
+++ ardour-2.4/libs/rubberband/src/RingBuffer.h 2008-04-05 15:29:00.000000000 -0400
@@ -15,6 +15,7 @@
#ifndef _RUBBERBAND_RINGBUFFER_H_
#define _RUBBERBAND_RINGBUFFER_H_
+#include <cstring>
#include <sys/types.h>
#ifndef _WIN32
diff -up ardour-2.4/libs/rubberband/src/StretchCalculator.cpp.gcc43 ardour-2.4/libs/rubberband/src/StretchCalculator.cpp
--- ardour-2.4/libs/rubberband/src/StretchCalculator.cpp.gcc43 2007-12-11 10:27:07.000000000 -0500
+++ ardour-2.4/libs/rubberband/src/StretchCalculator.cpp 2008-04-05 15:29:00.000000000 -0400
@@ -14,6 +14,7 @@
#include "StretchCalculator.h"
+#include <algorithm>
#include <math.h>
#include <iostream>
#include <deque>
diff -up ardour-2.4/libs/rubberband/src/StretcherProcess.cpp.gcc43 ardour-2.4/libs/rubberband/src/StretcherProcess.cpp
--- ardour-2.4/libs/rubberband/src/StretcherProcess.cpp.gcc43 2008-01-09 10:19:25.000000000 -0500
+++ ardour-2.4/libs/rubberband/src/StretcherProcess.cpp 2008-04-05 15:29:00.000000000 -0400
@@ -20,6 +20,7 @@
#include "StretcherChannelData.h"
#include "Resampler.h"
+#include <cstring>
#include <cassert>
#include <cmath>
#include <set>
diff -up ardour-2.4/libs/rubberband/src/Thread.cpp.gcc43 ardour-2.4/libs/rubberband/src/Thread.cpp
--- ardour-2.4/libs/rubberband/src/Thread.cpp.gcc43 2007-12-11 10:27:07.000000000 -0500
+++ ardour-2.4/libs/rubberband/src/Thread.cpp 2008-04-05 15:29:00.000000000 -0400
@@ -16,6 +16,7 @@
#include <iostream>
+#include <cstdlib>
#include <sys/time.h>
#include <time.h>
diff -up ardour-2.4/libs/rubberband/src/Window.h.gcc43 ardour-2.4/libs/rubberband/src/Window.h
--- ardour-2.4/libs/rubberband/src/Window.h.gcc43 2007-12-11 10:27:07.000000000 -0500
+++ ardour-2.4/libs/rubberband/src/Window.h 2008-04-05 15:29:00.000000000 -0400
@@ -15,6 +15,7 @@
#ifndef _RUBBERBAND_WINDOW_H_
#define _RUBBERBAND_WINDOW_H_
+#include <cstdlib>
#include <cmath>
#include <iostream>
#include <map>
diff -up ardour-2.4/libs/surfaces/tranzport/screen.cc.gcc43 ardour-2.4/libs/surfaces/tranzport/screen.cc
--- ardour-2.4/libs/surfaces/tranzport/screen.cc.gcc43 2008-04-05 16:55:26.000000000 -0400
+++ ardour-2.4/libs/surfaces/tranzport/screen.cc 2008-04-05 16:55:39.000000000 -0400
@@ -19,6 +19,7 @@
* */
#include <tranzport_control_protocol.h>
+#include <cstring>
void
TranzportControlProtocol::screen_clear ()
diff -up ardour-2.4/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp.gcc43 ardour-2.4/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp
--- ardour-2.4/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp.gcc43 2008-01-25 11:05:47.000000000 -0500
+++ ardour-2.4/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp 2008-04-05 15:29:00.000000000 -0400
@@ -42,6 +42,7 @@
#include <fstream>
#include <cctype> // tolower
+#include <cstring>
#ifdef _WIN32
diff -up ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp.gcc43 ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp
--- ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp.gcc43 2008-01-10 08:48:10.000000000 -0500
+++ ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp 2008-04-05 15:29:00.000000000 -0400
@@ -36,6 +36,9 @@
#include "PluginAdapter.h"
+#include <cstdlib>
+#include <cstring>
+
//#define DEBUG_PLUGIN_ADAPTER 1
diff -up ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp.gcc43 ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp
--- ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp.gcc43 2008-01-10 08:48:10.000000000 -0500
+++ ardour-2.4/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp 2008-04-05 15:29:00.000000000 -0400
@@ -36,6 +36,8 @@
#include "PluginHostAdapter.h"
+#include <cstdlib>
+
namespace Vamp
{
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ardour/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 9 Feb 2008 15:25:39 -0000 1.5
+++ .cvsignore 9 Apr 2008 18:13:06 -0000 1.6
@@ -1 +1 @@
-ardour-2.3.1.tar.bz2
+ardour-2.4.tar.bz2
Index: ardour.spec
===================================================================
RCS file: /cvs/extras/rpms/ardour/F-8/ardour.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ardour.spec 9 Feb 2008 16:31:40 -0000 1.14
+++ ardour.spec 9 Apr 2008 18:13:06 -0000 1.15
@@ -1,26 +1,30 @@
Summary: Multichannel Digital Audio Workstation
Name: ardour
-Version: 2.3.1
-Release: 3%{?dist}
+Version: 2.4
+Release: 1%{?dist}
Source: http://ardour.org/files/releases/ardour-%{version}.tar.bz2
Source1: ardour2.desktop
Source2: ardour.script
-Patch0: ardour-2.3-SConstruct.patch
+Patch0: ardour-2.1-SConstruct.patch
Patch1: ardour-session.cc-no_stomp.patch
Patch2: ardour-session.cc-_total_free_4k_blocks.patch
+Patch3: ardour-2.4-gcc43.patch
URL: http://ardour.org
License: GPLv2+
Group: Applications/Multimedia
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: scons, pkgconfig, libtool, fftw-devel
+BuildRequires: scons, pkgconfig, libtool
BuildRequires: libxslt-devel, libgnomecanvas-devel, boost-devel
BuildRequires: alsa-lib-devel, jack-audio-connection-kit-devel
BuildRequires: liblo-devel, libusb-devel
BuildRequires: gettext >= 0.11.5
BuildRequires: libsamplerate-devel >= 0.0.13
BuildRequires: liblrdf-devel >= 0.3.1
+BuildRequires: fftw-devel
+BuildRequires: gtkmm24-devel >= 2.8
+BuildRequires: libgnomecanvasmm26-devel >= 2.12
Requires: hicolor-icon-theme
BuildRequires: desktop-file-utils
@@ -46,42 +50,34 @@
modern digital mixers.
%prep
-%setup -q -n ardour-2.3
-%patch0 -p0
+%setup -q
+%patch0 -p1
%patch1 -p0
%patch2 -p0
+%patch3 -p1
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
done
%build
-# This may look strange, but it enables runtime enabled SSE optimalisations
+# <sigh> ardours SConstruct script is a mess when it comes to determining
+# opt_flags, so we override the lot using the ARCH= and DIST_TARGET= options
+
+TARGETCPU="none"
+
%ifarch %{ix86}
-TARGETCPU=i686
+ARCH_FLAGS="-DARCH_X86 -DBUILD_SSE_OPTIMIZATIONS"
+TARGETCPU="i386"
%endif
%ifarch x86_64
-TARGETCPU=x86_64
-%endif
-%ifarch ppc
-TARGETCPU=powerpc
-%endif
-%ifarch ppc64
-TARGETCPU=powerpc64
+ARCH_FLAGS="-DARCH_X86 -DBUILD_SSE_OPTIMIZATIONS -DUSE_X86_64_ASM"
+TARGETCPU="x86_64"
%endif
-%ifarch alpha
-TARGETCPU=alpha
-%endif
-
-if [ -z "$TARGETCPU" ]; then
- echo "Please add support for your architecture to ardour.spec and"
- echo "ardour-2.1-SConstruct.patch"
- exit 1
-fi
-scons %{?_smp_mflags} PREFIX=%{_prefix} \
+scons %{?_smp_mflags} PREFIX=%{_prefix} LIBDIR=%{_lib} SYSLIBS=1 \
DIST_TARGET="${TARGETCPU}" \
- ARCH="$RPM_OPT_FLAGS -ffast-math"
+ ARCH="$RPM_OPT_FLAGS $ARCH_FLAGS -ffast-math"
%install
rm -rf $RPM_BUILD_ROOT
@@ -136,35 +132,27 @@
%files -f ardour.lang
%defattr(-,root,root,-)
%doc README COPYING DOCUMENTATION
+%config(noreplace) %{_sysconfdir}/ardour2
%{_bindir}/ardour2
%{_libexecdir}/ardour2
%{_libdir}/ardour2/
%{_datadir}/ardour2/
%{_datadir}/ardour/
-%dir %{_sysconfdir}/ardour2/
-%config(noreplace) %{_sysconfdir}/ardour2/ardour_system.rc
-%config(noreplace) %{_sysconfdir}/ardour2/ardour2_ui_dark.rc
-%config(noreplace) %{_sysconfdir}/ardour2/ardour2_ui_default.conf
-%config(noreplace) %{_sysconfdir}/ardour2/ardour2_ui_light.rc
-%config(noreplace) %{_sysconfdir}/ardour2/ardour.bindings
-%config(noreplace) %{_sysconfdir}/ardour2/ardour.menus
-%config(noreplace) %{_sysconfdir}/ardour2/ardour-sae.menus
-%config(noreplace) %{_sysconfdir}/ardour2/ardour-sae-ansi.bindings
-%config(noreplace) %{_sysconfdir}/ardour2/ardour-sae-de.bindings
%{_datadir}/icons/hicolor/*/apps/ardour.png
%{_datadir}/applications/fedora-ardour2.desktop
%changelog
-* Sat Feb 09 2008 Anthony Green <green at redhat.com> 2.3.1-3
-- Fix powerpc64 support with new SConstruct patch changes.
+* Mon Apr 7 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4-1
+- New upstream release 2.4
+- Fix building with gcc-4.3, patch by Christopher Aillon (bz 434119, 440933)
+- Switch to using system libraries, as the included ones don't compile with
+ gcc-4.3 (bz 339391)
-* Sat Feb 09 2008 Anthony Green <green at redhat.com> 2.3.1-2
-- Remove glib patch.
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2-4
+- Autorebuild for GCC 4.3
-* Thu Feb 07 2008 Anthony Green <green at redhat.com> 2.3.1-1
-- Upgrade to ardour 2.3.1.
-- Update SConstruct patch.
-- BuildRequire fftw-devel.
+* Wed Jan 23 2008 Anthony Green <green at redhat.com> 2.2-3
+- Fix tagging glitch.
* Tue Jan 22 2008 Anthony Green <green at redhat.com> 2.2-2
- Fix wrapper script.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ardour/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 9 Feb 2008 15:25:39 -0000 1.5
+++ sources 9 Apr 2008 18:13:06 -0000 1.6
@@ -1 +1 @@
-54abb231ae0c1fa3b3f2c2177c644c22 ardour-2.3.1.tar.bz2
+c5a8e977c10424f2f19b23bf3ba75f42 ardour-2.4.tar.bz2
--- ardour-2.3-SConstruct.patch DELETED ---
More information about the fedora-extras-commits
mailing list