diff options
| -rw-r--r-- | media-sound/ardour/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/ardour/ardour-2.0.5.ebuild | 117 | ||||
| -rw-r--r-- | media-sound/ardour/ardour-2.4.1.ebuild | 131 | ||||
| -rw-r--r-- | media-sound/ardour/files/ardour-2.0.3-cflags.patch | 37 | ||||
| -rw-r--r-- | media-sound/ardour/files/ardour-2.4-gcc43.patch | 357 |
5 files changed, 6 insertions, 643 deletions
diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog index 2a8ddde3fe51..c62d69b1703d 100644 --- a/media-sound/ardour/ChangeLog +++ b/media-sound/ardour/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/ardour # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.77 2008/07/13 11:05:38 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.78 2008/08/05 23:19:02 aballier Exp $ + + 05 Aug 2008; Alexis Ballier <aballier@gentoo.org> + -files/ardour-2.0.3-cflags.patch, -files/ardour-2.4-gcc43.patch, + -ardour-2.0.5.ebuild, -ardour-2.4.1.ebuild: + remove old versions 13 Jul 2008; Alexis Ballier <aballier@gentoo.org> ardour-2.5.ebuild: require new enough jack, bug #231567 diff --git a/media-sound/ardour/ardour-2.0.5.ebuild b/media-sound/ardour/ardour-2.0.5.ebuild deleted file mode 100644 index 70e38c878ff8..000000000000 --- a/media-sound/ardour/ardour-2.0.5.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.0.5.ebuild,v 1.2 2008/02/29 20:03:47 carlo Exp $ - -inherit eutils toolchain-funcs flag-o-matic - -DESCRIPTION="multi-track hard disk recording software" -HOMEPAGE="http://ardour.org/" -SRC_URI="http://ardour.org/files/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="altivec debug fftw nls sse" - -RDEPEND="media-libs/liblo - >=media-libs/liblrdf-0.4.0 - >=media-libs/raptor-1.4.2 - >=media-sound/jack-audio-connection-kit-0.101.1 - >=dev-libs/glib-2.10.3 - x11-libs/pango - >=x11-libs/gtk+-2.8.8 - media-libs/flac - media-libs/alsa-lib - >=media-libs/libsamplerate-0.1.1-r1 - >=dev-libs/libxml2-2.6.0 - dev-libs/libxslt - >=media-libs/libsndfile-1.0.16 - gnome-base/libgnomecanvas - x11-themes/gtk-engines - >=dev-cpp/gtkmm-2.10 - dev-cpp/glibmm - >=dev-cpp/libgnomecanvasmm-2.10.0 - dev-cpp/cairomm - >=dev-libs/libsigc++-2.0 - media-libs/libsoundtouch - dev-libs/libusb - fftw? ( =sci-libs/fftw-3* )" - -DEPEND="${RDEPEND} - sys-devel/libtool - dev-libs/boost - dev-util/pkgconfig - >=dev-util/scons-0.96.1 - nls? ( sys-devel/gettext )" - -pkg_setup() { - if ! built_with_use dev-cpp/gtkmm accessibility; then - eerror "dev-cpp/gtkmm needs to be built with use accessibility" - eerror "in order to build ${PN}" - die "gtkmm was not built with use accessibility" - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${PN}-2.0.3-sndfile-external.patch" - epatch "${FILESDIR}/${PN}-2.0.3-cflags.patch" -} - -ardour_use_enable() { - use ${2} && echo "${1}=1" || echo "${1}=0" -} - -src_compile() { - # Required for scons to "see" intermediate install location - mkdir -p "${D}" - - local FPU_OPTIMIZATION=$((use altivec || use sse) && echo 1 || echo 0) - cd "${S}" - - tc-export CC CXX - - # Avoid compiling x86 asm when building on amd64 without using sse - # bug #186798 - use amd64 && append-flags "-DUSE_X86_64_ASM" - - scons \ - $(ardour_use_enable DEBUG debug) \ - FPU_OPTIMIZATION=${FPU_OPTIMIZATION} \ - DESTDIR="${D}" \ - $(ardour_use_enable NLS nls) \ - $(ardour_use_enable FFT_ANALYSIS fftw) \ - SYSLIBS=1 \ - CFLAGS="${CFLAGS}" \ - PREFIX=/usr || die "scons make failed" -} - -src_install() { - scons install || die "make install failed" - - dodoc DOCUMENTATION/* - - doicon "${S}/icons/icon/ardour_icon_mac.png" - make_desktop_entry ardour2 Ardour2 ardour_icon_mac AudioVideo -} - -pkg_postinst() { - ewarn "---------------- WARNING -------------------" - ewarn "" - ewarn "Do not use Ardour 2.0 to open the only copy of sessions created with Ardour 0.99." - ewarn "Ardour 2.0 saves the session file in a new format that Ardour 0.99 will" - ewarn "not understand." - ewarn "" - ewarn "MAKE BACKUPS OF THE SESSION FILES." - ewarn "" - ewarn "The simplest way to address this is to make a copy of the session file itself" - ewarn "(e.g mysession/mysession.ardour) and make that file unreadable using chmod(1)." - ewarn "" - ewarn "---------------- WARNING -------------------" - ewarn "" - ewarn "If you use KDE 3.5, be sure to uncheck 'Apply colors to non-KDE applications' in" - ewarn "the colors configuration module if you want to be able to actually see various" - ewarn "texts in Ardour 2." -} diff --git a/media-sound/ardour/ardour-2.4.1.ebuild b/media-sound/ardour/ardour-2.4.1.ebuild deleted file mode 100644 index e1e02e2ad5ef..000000000000 --- a/media-sound/ardour/ardour-2.4.1.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.4.1.ebuild,v 1.2 2008/04/20 16:54:45 aballier Exp $ - -inherit eutils toolchain-funcs flag-o-matic versionator - -DESCRIPTION="multi-track hard disk recording software" -HOMEPAGE="http://ardour.org/" -SRC_URI="http://ardour.org/files/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="altivec debug freesound nls sse" - -RDEPEND="media-libs/liblo - >=media-libs/liblrdf-0.4.0 - >=media-libs/raptor-1.4.2 - >=media-sound/jack-audio-connection-kit-0.101.1 - >=dev-libs/glib-2.10.3 - x11-libs/pango - >=x11-libs/gtk+-2.8.8 - media-libs/flac - >=media-libs/alsa-lib-1.0.14a-r1 - >=media-libs/libsamplerate-0.1.1-r1 - >=dev-libs/libxml2-2.6.0 - dev-libs/libxslt - >=media-libs/libsndfile-1.0.16 - gnome-base/libgnomecanvas - x11-themes/gtk-engines - >=dev-cpp/gtkmm-2.12.3 - >=dev-cpp/glibmm-2.14.2 - >=dev-cpp/libgnomecanvasmm-2.20.0 - dev-cpp/cairomm - >=dev-libs/libsigc++-2.0 - media-libs/libsoundtouch - dev-libs/libusb - =sci-libs/fftw-3* - freesound? ( net-misc/curl )" -# slv2? ( >=media-libs/slv2-0.6.0 ) - -DEPEND="${RDEPEND} - sys-devel/libtool - dev-libs/boost - dev-util/pkgconfig - >=dev-util/scons-0.96.1 - nls? ( sys-devel/gettext )" - -pkg_setup() { - if ! built_with_use dev-cpp/gtkmm accessibility; then - eerror "dev-cpp/gtkmm needs to be built with use accessibility" - eerror "in order to build ${PN}" - die "gtkmm was not built with use accessibility" - fi - if ! built_with_use --missing true media-libs/alsa-lib midi; then - eerror "" - eerror "To be able to build ${PN} you need" - eerror "to have built media-libs/alsa-lib with midi USE flag." - die "Missing midi USE flag on media-libs/alsa-lib" - fi -} - -#S=${WORKDIR}/${PN}-$(get_version_component_range 1-2) - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${PN}-2.0.3-sndfile-external.patch" - epatch "${FILESDIR}/${PN}-2.4-cflags.patch" - epatch "${FILESDIR}/${PN}-2.3.1-soundtouch.patch" - epatch "${FILESDIR}/${PN}-2.4-gcc43.patch" -} - -ardour_use_enable() { - use ${2} && echo "${1}=1" || echo "${1}=0" -} - -src_compile() { - # Required for scons to "see" intermediate install location - mkdir -p "${D}" - - local FPU_OPTIMIZATION=$((use altivec || use sse) && echo 1 || echo 0) - cd "${S}" - - tc-export CC CXX - - # Avoid compiling x86 asm when building on amd64 without using sse - # bug #186798 - use amd64 && append-flags "-DUSE_X86_64_ASM" - - scons \ - $(ardour_use_enable DEBUG debug) \ - FPU_OPTIMIZATION=${FPU_OPTIMIZATION} \ - DESTDIR="${D}" \ - $(ardour_use_enable NLS nls) \ - $(ardour_use_enable FREESOUND freesound) \ - FFT_ANALYSIS=1 \ - SYSLIBS=1 \ - CFLAGS="${CFLAGS}" \ - LV2=0 \ - PREFIX=/usr || die "scons failed" -} - -src_install() { - scons install || die "make install failed" - - dodoc DOCUMENTATION/* - - doicon "${S}/icons/icon/ardour_icon_mac.png" - make_desktop_entry ardour2 Ardour2 ardour_icon_mac AudioVideo -} - -pkg_postinst() { - ewarn "---------------- WARNING -------------------" - ewarn "" - ewarn "Do not use Ardour 2.0 to open the only copy of sessions created with Ardour 0.99." - ewarn "Ardour 2.0 saves the session file in a new format that Ardour 0.99 will" - ewarn "not understand." - ewarn "" - ewarn "MAKE BACKUPS OF THE SESSION FILES." - ewarn "" - ewarn "The simplest way to address this is to make a copy of the session file itself" - ewarn "(e.g mysession/mysession.ardour) and make that file unreadable using chmod(1)." - ewarn "" - ewarn "---------------- WARNING -------------------" - ewarn "" - ewarn "If you use KDE 3.5, be sure to uncheck 'Apply colors to non-KDE applications' in" - ewarn "the colors configuration module if you want to be able to actually see various" - ewarn "texts in Ardour 2." -} diff --git a/media-sound/ardour/files/ardour-2.0.3-cflags.patch b/media-sound/ardour/files/ardour-2.0.3-cflags.patch deleted file mode 100644 index 61ffa3c9b6ab..000000000000 --- a/media-sound/ardour/files/ardour-2.0.3-cflags.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: ardour-2.0.3/SConstruct -=================================================================== ---- ardour-2.0.3.orig/SConstruct -+++ ardour-2.0.3/SConstruct -@@ -27,6 +27,7 @@ subst_dict = { } - opts = Options('scache.conf') - opts.AddOptions( - ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''), -+ ('CFLAGS', 'Set custom CFLAGS',''), - BoolOption('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0), - BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0), - BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0), -@@ -668,14 +669,18 @@ if env['ARCH'] != '': - # prepend boiler plate optimization flags - # - --opt_flags[:0] = [ -- "-O3", -- "-fomit-frame-pointer", -- "-ffast-math", -- "-fstrength-reduce", -- "-pipe" -+if env['CFLAGS'] != '': -+ opt_flags[:0]=env['CFLAGS'].split() -+else: -+ 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)) diff --git a/media-sound/ardour/files/ardour-2.4-gcc43.patch b/media-sound/ardour/files/ardour-2.4-gcc43.patch deleted file mode 100644 index 4ccb85b21f30..000000000000 --- a/media-sound/ardour/files/ardour-2.4-gcc43.patch +++ /dev/null @@ -1,357 +0,0 @@ -http://tracker.ardour.org/view.php?id=2181 - -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: ardour-2.4-gcc43.patch,v 1.1 2008/04/20 16:54:46 aballier Exp $ - */ - --#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: ardour-2.4-gcc43.patch,v 1.1 2008/04/20 16:54:46 aballier Exp $ - */ - -+#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: ardour-2.4-gcc43.patch,v 1.1 2008/04/20 16:54:46 aballier Exp $ - */ - -+#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 - { - |