# Created by: Edward Tomasz Napierala <trasz@pin.if.uz.zgora.pl>

# $FreeBSD$

PORTNAME=	ardour

PORTVERSION=	2.8.16

PORTREVISION=	6

CATEGORIES=	audio

MASTER_SITES=	http://freebsd.nsu.ru/distfiles/

MAINTAINER=	danfe@FreeBSD.org

COMMENT=	Multichannel digital audio workstation

LICENSE=	GPLv2

LICENSE_FILE=	${WRKSRC}/COPYING

BROKEN=		fails to build

LIB_DEPENDS=	liblo.so:audio/liblo \

		liblrdf.so:textproc/liblrdf \

		libjack.so:audio/jack \

		libaubio.so:audio/aubio \

		libfftw3.so:math/fftw3 \

		libfftw3f.so:math/fftw3-float \

		libboost_date_time.so:devel/boost-libs \

		libgnomecanvasmm-2.6.so:graphics/libgnomecanvasmm26

USES=		cpe gettext scons pkgconfig tar:bzip2

MAKE_ARGS+=	SYSLIBS=yes PREFIX=${PREFIX} NLS=yes

CFLAGS+=	-I${LOCALBASE}/include -DHAVE_AUBIO4

USE_GNOME=	libxslt

USE_LDCONFIG=	${PREFIX}/lib/ardour2 ${PREFIX}/lib/ardour2/surfaces

PLIST_SUB=	DISTVERSION=${DISTVERSION}

OPTIONS_DEFINE=	OPTIMIZED_CFLAGS VST

VST_DESC=	VST plugins support

BROKEN_powerpc64=	Does not build

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MVST}

MAKE_ARGS+=	VST=yes

LIB_DEPENDS+=	libwine.so:emulators/wine

PLIST_SUB+=	NO_VST="@comment "

PLIST_SUB+=	VST=""

.else

PLIST_SUB+=	NO_VST=""

PLIST_SUB+=	VST="@comment "

.endif

# Upstream uses these flags by default

.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}

CFLAGS+=	-O3 -fomit-frame-pointer -ffast-math -fstrength-reduce

.  if ${ARCH} == "amd64"

MAKE_ARGS+=	DIST_TARGET=x86_64

MAKE_ARGS+=	FPU_OPTIMIZATION=1

.  elif ${MACHINE_CPU:Msse}

MAKE_ARGS+=	DIST_TARGET=i686

MAKE_ARGS+=	FPU_OPTIMIZATION=1

.  else

MAKE_ARGS+=	DIST_TARGET=i386

MAKE_ARGS+=	FPU_OPTIMIZATION=0

.  endif

.else

MAKE_ARGS+=	FPU_OPTIMIZATION=0

.endif

post-patch:

	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/SConstruct

	@${REINPLACE_CMD} -e 's|alsa_pcm|oss|g' ${WRKSRC}/templates/*.template

	@${REINPLACE_CMD} -e 's|std::pair<double|std::pair<const double|' \

		${WRKSRC}/gtk2_ardour/tempo_lines.h

post-install:

	@${MKDIR} ${STAGEDIR}${PREFIX}/share/ardour2/templates

	${INSTALL_DATA} ${WRKSRC}/templates/*.template \

		${STAGEDIR}${PREFIX}/share/ardour2/templates

.include <bsd.port.mk>

SHA256 (ardour-2.8.16.tar.bz2) = 37ee32119ba105fa0883faa7e18c58ecd5276894568da224a554d9ef49075e40

SIZE (ardour-2.8.16.tar.bz2) = 2169916

--- SConstruct.orig

+++ SConstruct

@@ -784,10 +784,7 @@ if env['FPU_OPTIMIZATION']:

 # handle x86/x86_64 libdir properly

 if env['DIST_LIBDIR'] == '':

-    if env['DIST_TARGET'] == 'x86_64':

-        env['LIBDIR']='lib64'

-    else:

-        env['LIBDIR']='lib'

+    env['LIBDIR']='lib'

 else:

     env['LIBDIR'] = env['DIST_LIBDIR']

@@ -838,13 +835,7 @@ if env['ARCH'] != '':

 # prepend boiler plate optimization flags

 #

-opt_flags[:0] = [

-    "-O3",

-    "-fomit-frame-pointer",

-    "-ffast-math",

-    "-fstrength-reduce",

-    "-pipe"

-    ]

+opt_flags[:0] = [ "%%CFLAGS%%" ];

 if env['DEBUG'] == 1:

     env.Append(CCFLAGS=" ".join (debug_flags))

@@ -954,6 +945,7 @@ conf.Finish()

 libraries['usb'] = LibraryInfo ()

 prep_libcheck(env, libraries['usb'])

+libraries['usb'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib")

 conf = Configure (libraries['usb'])

 if conf.CheckLib ('usb', 'usb_interrupt_write'):

@@ -1005,6 +997,7 @@ libraries['boost'] = conf.Finish ()

 libraries['dmalloc'] = LibraryInfo ()

 prep_libcheck(env, libraries['dmalloc'])

+libraries['dmalloc'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib")

 #

 # look for the threaded version

@@ -1062,8 +1055,10 @@ elif conf.CheckCHeader('/System/Library/

     subst_dict['%MIDITAG%'] = "ardour"

     subst_dict['%MIDITYPE%'] = "coremidi"

 else:

-    print "It appears you don't have the required MIDI libraries installed. For Linux this means you are missing the development package for ALSA libraries."

-    sys.exit (1)

+    libraries['sysmidi'] = LibraryInfo ()

+    env['SYSMIDI'] = 'none'

+    subst_dict['%MIDITAG%'] = "none"

+    subst_dict['%MIDITYPE%'] = "none"

 pname = env['PROGRAM_NAME']

 subst_dict['%MIDI_DEVICE_NAME%'] = pname.lower()

@@ -1349,8 +1344,8 @@ if conf.CheckCHeader('/System/Library/Fr

     subst_dict['%JACK_INPUT%'] = "coreaudio:Built-in Audio:in"

     subst_dict['%JACK_OUTPUT%'] = "coreaudio:Built-in Audio:out"

 else:

-    subst_dict['%JACK_INPUT%'] = "alsa_pcm:playback_"

-    subst_dict['%JACK_OUTPUT%'] = "alsa_pcm:capture_"

+    subst_dict['%JACK_INPUT%'] = "oss:playback_"

+    subst_dict['%JACK_OUTPUT%'] = "oss:capture_"

 # posix_memalign available

 if not conf.CheckFunc('posix_memalign'):

commit 1eaa30b7257f006878c9b2c88ecbaea5bc36b174

Author: Robin Gareus <robin@gareus.org>

Date:   Sun Jan 12 18:11:14 2014 +0100

    aubio 3+4 compat

diff --git libs/vamp-plugins/Onset.cpp libs/vamp-plugins/Onset.cpp

index d475b11..196ca29 100644

--- libs/vamp-plugins/Onset.cpp

+++ libs/vamp-plugins/Onset.cpp

@@ -22,29 +22,51 @@ using std::vector;

 using std::cerr;

 using std::endl;

+#ifdef HAVE_AUBIO4

+const char *getAubioNameForOnsetType(OnsetType t)

+{

+    // In the same order as the enum elements in the header

+    static const char *const names[] = {

+        "energy", "specdiff", "hfc", "complex", "phase", "kl", "mkl", "specflux"

+    };

+    return names[(int)t];

+}

+#endif

+

 Onset::Onset(float inputSampleRate) :

     Plugin(inputSampleRate),

     m_ibuf(0),

-    m_fftgrain(0),

     m_onset(0),

+#ifdef HAVE_AUBIO4

+    m_onsetdet(0),

+    m_onsettype(OnsetComplex),

+    m_minioi(4),

+    m_silence(-70),

+#else

+    m_fftgrain(0),

     m_pv(0),

     m_peakpick(0),

     m_onsetdet(0),

     m_onsettype(aubio_onset_complex),

-    m_threshold(0.3),

+    m_channelCount(1),

     m_silence(-90),

-    m_channelCount(1)

+#endif

+    m_threshold(0.3)

 {

 }

 Onset::~Onset()

 {

+#ifdef HAVE_AUBIO4

+    if (m_onsetdet) del_aubio_onset(m_onsetdet);

+#else

     if (m_onsetdet) aubio_onsetdetection_free(m_onsetdet);

-    if (m_ibuf) del_fvec(m_ibuf);

-    if (m_onset) del_fvec(m_onset);

     if (m_fftgrain) del_cvec(m_fftgrain);

     if (m_pv) del_aubio_pvoc(m_pv);

     if (m_peakpick) del_aubio_peakpicker(m_peakpick);

+#endif

+    if (m_ibuf) del_fvec(m_ibuf);

+    if (m_onset) del_fvec(m_onset);

 }

 string

@@ -74,7 +96,11 @@ Onset::getMaker() const

 int

 Onset::getPluginVersion() const

 {

+#ifdef HAVE_AUBIO4

+    return 2;

+#else

     return 1;

+#endif

 }

 string

@@ -86,10 +112,20 @@ Onset::getCopyright() const

 bool

 Onset::initialise(size_t channels, size_t stepSize, size_t blockSize)

 {

-    m_channelCount = channels;

     m_stepSize = stepSize;

     m_blockSize = blockSize;

+#ifdef HAVE_AUBIO4

+    if (channels != 1) {

+        std::cerr << "Onset::initialise: channels must be 1" << std::endl;

+        return false;

+    }

+    m_ibuf = new_fvec(stepSize);

+    m_onset = new_fvec(1);

+    reset();

+#else

+    m_channelCount = channels;

+

     m_ibuf = new_fvec(stepSize, channels);

     m_onset = new_fvec(1, channels);

     m_fftgrain = new_cvec(blockSize, channels);

@@ -103,13 +139,32 @@ Onset::initialise(size_t channels, size_t stepSize, size_t blockSize)

     m_lastOnset = Vamp::RealTime::zeroTime - m_delay - m_delay;

+#endif

     return true;

 }

+#ifdef HAVE_AUBIO4

 void

 Onset::reset()

 {

+    if (m_onsetdet) del_aubio_onset(m_onsetdet);

+

+    m_onsetdet = new_aubio_onset

+        (const_cast<char *>(getAubioNameForOnsetType(m_onsettype)),

+         m_blockSize,

+         m_stepSize,

+         lrintf(m_inputSampleRate));

+    

+    aubio_onset_set_threshold(m_onsetdet, m_threshold);

+    aubio_onset_set_silence(m_onsetdet, m_silence);

+    aubio_onset_set_minioi(m_onsetdet, m_minioi);

+

+    m_delay = Vamp::RealTime::frame2RealTime(4 * m_stepSize,

+                                             lrintf(m_inputSampleRate));

+

+    m_lastOnset = Vamp::RealTime::zeroTime - m_delay - m_delay;

 }

+#endif

 size_t

 Onset::getPreferredStepSize() const

@@ -132,8 +187,13 @@ Onset::getParameterDescriptors() const

     desc.identifier = "onsettype";

     desc.name = "Onset Detection Function Type";

     desc.minValue = 0;

+#ifdef HAVE_AUBIO4

+    desc.maxValue = 7;

+    desc.defaultValue = (int)OnsetComplex;

+#else

     desc.maxValue = 6;

     desc.defaultValue = (int)aubio_onset_complex;

+#endif

     desc.isQuantized = true;

     desc.quantizeStep = 1;

     desc.valueNames.push_back("Energy Based");

@@ -143,6 +203,9 @@ Onset::getParameterDescriptors() const

     desc.valueNames.push_back("Phase Deviation");

     desc.valueNames.push_back("Kullback-Liebler");

     desc.valueNames.push_back("Modified Kullback-Liebler");

+#ifdef HAVE_AUBIO4

+    desc.valueNames.push_back("Spectral Flux");

+#endif

     list.push_back(desc);

     desc = ParameterDescriptor();

@@ -159,11 +222,27 @@ Onset::getParameterDescriptors() const

     desc.name = "Silence Threshold";

     desc.minValue = -120;

     desc.maxValue = 0;

+#ifdef HAVE_AUBIO4

+    desc.defaultValue = -70;

+#else

     desc.defaultValue = -90;

+#endif

     desc.unit = "dB";

     desc.isQuantized = false;

     list.push_back(desc);

+#ifdef HAVE_AUBIO4

+    desc = ParameterDescriptor();

+    desc.identifier = "minioi";

+    desc.name = "Minimum Inter-Onset Interval";

+    desc.minValue = 0;

+    desc.maxValue = 40;

+    desc.defaultValue = 4;

+    desc.unit = "ms";

+    desc.isQuantized = true;

+    desc.quantizeStep = 1;

+    list.push_back(desc);

+#endif

     return list;

 }

@@ -176,6 +255,10 @@ Onset::getParameter(std::string param) const

         return m_threshold;

     } else if (param == "silencethreshold") {

         return m_silence;

+#ifdef HAVE_AUBIO4

+    } else if (param == "minioi") {

+        return m_minioi;

+#endif

     } else {

         return 0.0;

     }

@@ -186,6 +269,16 @@ Onset::setParameter(std::string param, float value)

 {

     if (param == "onsettype") {

         switch (lrintf(value)) {

+#ifdef HAVE_AUBIO4

+        case 0: m_onsettype = OnsetEnergy; break;

+        case 1: m_onsettype = OnsetSpecDiff; break;

+        case 2: m_onsettype = OnsetHFC; break;

+        case 3: m_onsettype = OnsetComplex; break;

+        case 4: m_onsettype = OnsetPhase; break;

+        case 5: m_onsettype = OnsetKL; break;

+        case 6: m_onsettype = OnsetMKL; break;

+        case 7: m_onsettype = OnsetSpecFlux; break;

+#else

         case 0: m_onsettype = aubio_onset_energy; break;

         case 1: m_onsettype = aubio_onset_specdiff; break;

         case 2: m_onsettype = aubio_onset_hfc; break;

@@ -193,11 +286,16 @@ Onset::setParameter(std::string param, float value)

         case 4: m_onsettype = aubio_onset_phase; break;

         case 5: m_onsettype = aubio_onset_kl; break;

         case 6: m_onsettype = aubio_onset_mkl; break;

+#endif

         }

     } else if (param == "peakpickthreshold") {

         m_threshold = value;

     } else if (param == "silencethreshold") {

         m_silence = value;

+#ifdef HAVE_AUBIO4

+    } else if (param == "minioi") {

+        m_minioi = value;

+#endif

     }

 }

@@ -216,6 +314,7 @@ Onset::getOutputDescriptors() const

     d.sampleRate = 0;

     list.push_back(d);

+#ifndef HAVE_AUBIO4

     d = OutputDescriptor();

     d.identifier = "detectionfunction";

     d.name = "Onset Detection Function";

@@ -226,7 +325,7 @@ Onset::getOutputDescriptors() const

     d.isQuantized = false;

     d.sampleType = OutputDescriptor::OneSamplePerStep;

     list.push_back(d);

-

+#endif

     return list;

 }

@@ -234,6 +333,15 @@ Onset::FeatureSet

 Onset::process(const float *const *inputBuffers,

                Vamp::RealTime timestamp)

 {

+#ifdef HAVE_AUBIO4

+    for (size_t i = 0; i < m_stepSize; ++i) {

+        fvec_set_sample(m_ibuf, inputBuffers[0][i], i);

+    }

+

+    aubio_onset_do(m_onsetdet, m_ibuf, m_onset);

+

+    bool isonset = m_onset->data[0];

+#else

     for (size_t i = 0; i < m_stepSize; ++i) {

         for (size_t j = 0; j < m_channelCount; ++j) {

             fvec_write_sample(m_ibuf, inputBuffers[j][i], j, i);

@@ -250,6 +358,7 @@ Onset::process(const float *const *inputBuffers,

             isonset = false;

         }

     }

+#endif

     FeatureSet returnFeatures;

@@ -263,11 +372,13 @@ Onset::process(const float *const *inputBuffers,

             m_lastOnset = timestamp;

         }

     }

+#ifndef HAVE_AUBIO4

     Feature feature;

     for (size_t j = 0; j < m_channelCount; ++j) {

         feature.values.push_back(m_onset->data[j][0]);

     }

     returnFeatures[1].push_back(feature);

+#endif

     return returnFeatures;

 }

diff --git libs/vamp-plugins/Onset.h libs/vamp-plugins/Onset.h

index 314e107..bba95e0 100644

--- libs/vamp-plugins/Onset.h

+++ libs/vamp-plugins/Onset.h

@@ -20,6 +20,19 @@

 #include <vamp-sdk/Plugin.h>

 #include <aubio/aubio.h>

+#ifdef HAVE_AUBIO4

+enum OnsetType {

+    OnsetEnergy,

+    OnsetSpecDiff,

+    OnsetHFC,

+    OnsetComplex,

+    OnsetPhase,

+    OnsetKL,

+    OnsetMKL,

+    OnsetSpecFlux // new in 0.4!

+};

+#endif

+

 class Onset : public Vamp::Plugin

 {

 public:

@@ -54,20 +67,25 @@ public:

 protected:

     fvec_t *m_ibuf;

-    cvec_t *m_fftgrain;

     fvec_t *m_onset;

+#ifdef HAVE_AUBIO4

+    aubio_onset_t *m_onsetdet;

+    OnsetType m_onsettype;

+    float m_minioi;

+#else

+    cvec_t *m_fftgrain;

     aubio_pvoc_t *m_pv;

     aubio_pickpeak_t *m_peakpick;

     aubio_onsetdetection_t *m_onsetdet;

     aubio_onsetdetection_type m_onsettype;

-    float m_threshold;

+    size_t m_channelCount;

+#endif

     float m_silence;

+    float m_threshold;

     size_t m_stepSize;

     size_t m_blockSize;

-    size_t m_channelCount;

     Vamp::RealTime m_delay;

     Vamp::RealTime m_lastOnset;

 };

-

 #endif

--- SConstruct.orig      2012-11-21 00:30:54.000000000 +0100

+++ SConstruct  2012-11-21 17:34:02.000000000 +0100

@@ -955,7 +961,9 @@

 # FLAC ....

 #

-# boost (we don't link against boost, just use some header files)

+# boost (we need to link against boost with >=1.50. header files alone will not work anymore)

+

+env.Append(LIBS=['boost_system'])

 libraries['boost'] = LibraryInfo ()

 prep_libcheck(env, libraries['boost'])

--- gtk2_ardour/automation_selectable.h.orig	2009-02-24 12:37:42 UTC

+++ gtk2_ardour/automation_selectable.h

@@ -36,7 +36,7 @@ struct AutomationSelectable : public Sel

     AutomationSelectable (nframes_t s, nframes_t e, double l, double h, TimeAxisView& atv)

 	    : start (s), end (e), low_fract (l), high_fract (h), track (atv) {}

-    bool operator== (const AutomationSelectable& other) {

+    bool operator== (const AutomationSelectable& other) const {

 	    return start == other.start &&

 		    end == other.end &&

 		    low_fract == other.low_fract &&

--- gtk2_ardour/SConscript.orig

+++ gtk2_ardour/SConscript

@@ -411,9 +411,9 @@ for style in ['', 'BOLD', 'ITALIC']:

 # 

 if env['GTKOSX']:

-	ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P -DGTKOSX -DTOP_MENUBAR ardour.menus.in ardour.menus", chdir=1)

+	ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P -DGTKOSX -DTOP_MENUBAR -o ardour.menus ardour.menus.in", chdir=1)

 else:

-	ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P ardour.menus.in ardour.menus", chdir=1)

+	ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P -o ardour.menus ardour.menus.in", chdir=1)

 ardour_dark_theme = env.SubstInFile ('ardour2_ui_dark.rc', 'ardour2_ui_dark.rc.in', SUBST_DICT = my_font_dict)

 ardour_light_theme = env.SubstInFile ('ardour2_ui_light.rc', 'ardour2_ui_light.rc.in', SUBST_DICT = my_font_dict)

--- gtk2_ardour/ardour_ui.cc.orig

+++ gtk2_ardour/ardour_ui.cc

@@ -31,6 +31,8 @@

 #include <iostream>

 #include <sys/resource.h>

+#include <sys/types.h>

+#include <sys/sysctl.h>

 #include <gtkmm/messagedialog.h>

 #include <gtkmm/accelmap.h>

@@ -696,8 +698,11 @@ ARDOUR_UI::check_memory_locking ()

 		struct rlimit limits;

 		int64_t ram;

 		long pages, page_size;

+		size_t pages_len=sizeof(pages);

+

+		if ((page_size = getpagesize()) < 0 ||

+			sysctlbyname("hw.availpages", &pages, &pages_len, NULL, 0)) {

-		if ((page_size = sysconf (_SC_PAGESIZE)) < 0 ||(pages = sysconf (_SC_PHYS_PAGES)) < 0) {

 			ram = 0;

 		} else {

 			ram = (int64_t) pages * (int64_t) page_size;

@@ -716,7 +721,7 @@ ARDOUR_UI::check_memory_locking ()

 								     "This might cause %1 to run out of memory before your system "

 								     "runs out of memory. \n\n"

 								     "You can view the memory limit with 'ulimit -l', "

-								     "and it is normally controlled by /etc/security/limits.conf"), PROGRAM_NAME));

+								     "and it is normally controlled by /etc/login.conf"), PROGRAM_NAME));

 				VBox* vbox = msg.get_vbox();

 				HBox hbox;

--- gtk2_ardour/connection_editor.cc.orig

+++ gtk2_ardour/connection_editor.cc

@@ -502,9 +502,9 @@ ConnectionEditor::display_connection_sta

 	frame_label += _("\"");

 	port_frame.set_label (frame_label);

-	for (slist<ScrolledWindow *>::iterator i = port_displays.begin(); i != port_displays.end(); ) {

+	for (boost::container::slist<ScrolledWindow *>::iterator i = port_displays.begin(); i != port_displays.end(); ) {

-		slist<ScrolledWindow *>::iterator tmp;

+		boost::container::slist<ScrolledWindow *>::iterator tmp;

 		tmp = i;

 		tmp++;

@@ -612,7 +612,7 @@ ConnectionEditor::connection_port_button

 		tview->set_name ("ConnectionEditorPortListSelected");

-		for (slist<ScrolledWindow *>::iterator i = port_displays.begin(); i != port_displays.end(); ++i) {

+		for (boost::container::slist<ScrolledWindow *>::iterator i = port_displays.begin(); i != port_displays.end(); ++i) {

 			Widget *child = (*i)->get_child();

--- gtk2_ardour/connection_editor.h.orig

+++ gtk2_ardour/connection_editor.h

@@ -20,12 +20,7 @@

 #ifndef __ardour_gtk_connection_editor_h__

 #define __ardour_gtk_connection_editor_h__

-#if __GNUC__ >= 3

-#include <ext/slist>

-using __gnu_cxx::slist;

-#else

-#include <slist.h>

-#endif

+#include <boost/container/slist.hpp>

 #include <gtkmm/box.h>

 #include <gtkmm/window.h>

@@ -116,7 +111,7 @@ class ConnectionEditor : public ArdourDi

 	Gtk::Button add_port_button;

 	Glib::Mutex port_display_lock;

-	slist<Gtk::ScrolledWindow *> port_displays;

+	boost::container::slist<Gtk::ScrolledWindow *> port_displays;

 	Gtk::Button ok_button;

 	Gtk::Button cancel_button;

--- gtk2_ardour/engine_dialog.cc.orig	2008-04-09 23:17:02.000000000 +0200

+++ gtk2_ardour/engine_dialog.cc	2008-04-10 18:53:32.000000000 +0200

@@ -12,7 +12,7 @@

 #include <CoreFoundation/CFString.h>

 #include <sys/param.h>

 #include <mach-o/dyld.h>

-#else

+#elif !defined(__FreeBSD__)

 #include <alsa/asoundlib.h>

 #endif

@@ -113,7 +113,9 @@

 #ifdef __APPLE__

 	strings.push_back (X_("CoreAudio"));

 #else

+#ifndef __FreeBSD__

 	strings.push_back (X_("ALSA"));

+#endif

 	strings.push_back (X_("OSS"));

 	strings.push_back (X_("FFADO"));

 #endif

@@ -158,7 +160,7 @@

 	basic_packer.attach (period_size_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);

 	row++;

-#ifndef __APPLE__

+#if !defined(__APPLE__) && !defined(__FreeBSD__)

 	label = manage (new Label (_("Number of buffers")));

 	basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);

 	basic_packer.attach (periods_spinner, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);

@@ -179,7 +181,7 @@

 	row++;

 	/* no audio mode with CoreAudio, its duplex or nuthin' */

-#ifndef __APPLE__

+#if !defined(__APPLE__) && !defined(__FreeBSD__)

 	label = manage (new Label (_("Audio Mode")));

 	basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);

 	basic_packer.attach (audio_mode_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);

@@ -218,7 +220,7 @@

 	realtime_button.signal_toggled().connect (mem_fun (*this, &EngineControl::realtime_changed));

 	realtime_changed ();

-#ifndef __APPLE__

+#if !defined(__APPLE__) && !defined(__FreeBSD__)

 	label = manage (new Label (_("Realtime Priority")));

 	label->set_alignment (1.0, 0.5);

 	options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);

@@ -268,7 +270,7 @@

 	options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);

 	++row;

-#ifndef __APPLE__

+#if !defined(__APPLE__) && !defined(__FreeBSD__)

 	label = manage (new Label (_("Dither")));	

 	label->set_alignment (1.0, 0.5);

 	options_packer.attach (dither_mode_combo, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));

@@ -299,7 +301,7 @@

 	device_packer.set_spacings (6);

 	row = 0;

-#ifndef __APPLE__

+#if !defined(__APPLE__) && !defined(__FreeBSD__)

 	label = manage (new Label (_("Input device")));

 	label->set_alignment (1.0, 0.5);

 	device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0);

@@ -570,7 +572,7 @@

 void

 EngineControl::realtime_changed ()

 {

-#ifndef __APPLE__

+#if !defined(__APPLE__) && !defined(__FreeBSD__)

 	priority_spinner.set_sensitive (realtime_button.get_active());

 #endif

 }

@@ -586,8 +588,10 @@

 #endif

 #ifndef __APPLE__

+#ifndef __FreeBSD__

 	} else if (driver == "ALSA") {

 		devices[driver] = enumerate_alsa_devices ();

+#endif

 	} else if (driver == "FFADO") {

 		devices[driver] = enumerate_ffado_devices ();

 	} else if (driver == "OSS") {

@@ -714,6 +718,7 @@

 	return devs;

 }

 #else

+#ifndef __FreeBSD__

 vector<string>

 EngineControl::enumerate_alsa_devices ()

 {

@@ -774,6 +779,7 @@

 	return devs;

 }

+#endif

 vector<string>

 EngineControl::enumerate_ffado_devices ()

@@ -816,7 +822,9 @@

 	vector<string>& strings = devices[driver];

 	if (strings.empty() && driver != "FFADO" && driver != "Dummy") {

+#if 0

 		error << string_compose (_("No devices found for driver \"%1\""), driver) << endmsg;

+#endif

 		return;

 	}

@@ -862,7 +870,7 @@

 EngineControl::redisplay_latency ()

 {

 	uint32_t rate = get_rate();

-#ifdef __APPLE_

+#if defined(__APPLE_) || defined(__FreeBSD__)

 	float periods = 2;

 #else

 	float periods = periods_adjustment.get_value();

--- gtk2_ardour/io_selector.cc.orig

+++ gtk2_ardour/io_selector.cc

@@ -389,9 +389,9 @@ IOSelector::display_ports ()

 			limit = io->n_outputs();

 		}

-		for (slist<TreeView *>::iterator i = port_displays.begin(); i != port_displays.end(); ) {

+		for (boost::container::slist<TreeView *>::iterator i = port_displays.begin(); i != port_displays.end(); ) {

-			slist<TreeView *>::iterator tmp;

+			boost::container::slist<TreeView *>::iterator tmp;

 			tmp = i;

 			++tmp;

@@ -632,13 +632,13 @@ IOSelector::connection_button_release (G

 void

 IOSelector::select_next_treeview ()

 {

-	slist<TreeView*>::iterator next;

+	boost::container::slist<TreeView*>::iterator next;

 	if (port_displays.empty() || port_displays.size() == 1) {

 		return;

 	}

-	for (slist<TreeView *>::iterator i = port_displays.begin(); i != port_displays.end(); ++i) {

+	for (boost::container::slist<TreeView *>::iterator i = port_displays.begin(); i != port_displays.end(); ++i) {

 		if ((*i)->get_name() == "IOSelectorPortListSelected") {

@@ -681,7 +681,7 @@ IOSelector::select_treeview (TreeView* t

 		gtk_widget_queue_draw (ccol->button);

 	}

-	for (slist<TreeView*>::iterator i = port_displays.begin(); i != port_displays.end(); ++i) {

+	for (boost::container::slist<TreeView*>::iterator i = port_displays.begin(); i != port_displays.end(); ++i) {

 		if (*i == tview) {

 			continue;

 		}

--- gtk2_ardour/io_selector.h.orig

+++ gtk2_ardour/io_selector.h

@@ -20,12 +20,7 @@

 #ifndef __ardour_ui_io_selector_h__

 #define __ardour_ui_io_selector_h__

-#if __GNUC__ >= 3

-#include <ext/slist>

-using __gnu_cxx::slist;

-#else

-#include <slist.h>

-#endif

+#include <boost/container/slist.hpp>

 #include <string>

@@ -110,7 +105,7 @@ class IOSelector : public Gtk::VBox {

 	Gtk::ScrolledWindow port_display_scroller;

 	Glib::Mutex port_display_lock;

-	slist<Gtk::TreeView *> port_displays;

+	boost::container::slist<Gtk::TreeView *> port_displays;

 	void display_ports ();

 	void rescan ();

--- gtk2_ardour/new_session_dialog.cc.orig	2008-01-14 10:04:17.000000000 +0100

+++ gtk2_ardour/new_session_dialog.cc	2008-01-14 10:04:44.000000000 +0100

@@ -556,7 +556,7 @@

 	*/

-#ifdef __APPLE__

+#ifndef __Linux__

 	char buf[PATH_MAX];

--- libs/ardour/ardour/io.h.orig

+++ libs/ardour/ardour/io.h

@@ -288,6 +288,10 @@ class IO : public PBD::StatefulDestructi

 	XMLNode *pending_state_node;

 	int ports_became_legal ();

+	static bool connecting_is_legal() {

+		return connecting_legal;

+	}

+

   private:

 	mutable Glib::Mutex io_lock;

--- libs/ardour/session.cc.orig

+++ libs/ardour/session.cc

@@ -79,7 +79,6 @@

 using namespace std;

 using namespace ARDOUR;

 using namespace PBD;

-using boost::shared_ptr;

 #ifdef __x86_64__

 static const int CPU_CACHE_ALIGN = 64;

@@ -399,14 +398,14 @@ Session::Session (AudioEngine &eng,

 		int control_id = 1;

 		if (control_out_channels) {

-			shared_ptr<Route> r (new Route (*this, _("monitor"), -1, control_out_channels, -1, control_out_channels, Route::ControlOut));

+			boost::shared_ptr<Route> r (new Route (*this, _("monitor"), -1, control_out_channels, -1, control_out_channels, Route::ControlOut));

 			r->set_remote_control_id (control_id++);

 			rl.push_back (r);

 		}

 		if (master_out_channels) {

-			shared_ptr<Route> r (new Route (*this, _("master"), -1, master_out_channels, -1, master_out_channels, Route::MasterOut));

+			boost::shared_ptr<Route> r (new Route (*this, _("master"), -1, master_out_channels, -1, master_out_channels, Route::MasterOut));

 			r->set_remote_control_id (control_id);

 			rl.push_back (r);

@@ -984,8 +983,8 @@ Session::hookup_io ()

 boost::shared_ptr<Session::RouteList>

 Session::get_routes_with_regions_at (nframes64_t const p) const

 {

-	shared_ptr<RouteList> r = routes.reader ();

-	shared_ptr<RouteList> rl (new RouteList);

+	boost::shared_ptr<RouteList> r = routes.reader ();

+	boost::shared_ptr<RouteList> rl (new RouteList);

 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {

 		boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);

@@ -1590,9 +1589,9 @@ struct RouteSorter {

 };

 static void

-trace_terminal (shared_ptr<Route> r1, shared_ptr<Route> rbase)

+trace_terminal (boost::shared_ptr<Route> r1, boost::shared_ptr<Route> rbase)

 {

-	shared_ptr<Route> r2;

+	boost::shared_ptr<Route> r2;

 	if ((r1->fed_by.find (rbase) != r1->fed_by.end()) && (rbase->fed_by.find (r1) != rbase->fed_by.end())) {

 		info << string_compose(_("feedback loop setup between %1 and %2"), r1->name(), rbase->name()) << endmsg;

@@ -1601,13 +1600,13 @@ trace_terminal (shared_ptr<Route> r1, sh

 	/* make a copy of the existing list of routes that feed r1 */

-	set<shared_ptr<Route> > existing = r1->fed_by;

+	set<boost::shared_ptr<Route> > existing = r1->fed_by;

 	/* for each route that feeds r1, recurse, marking it as feeding

 	   rbase as well.

 	*/

-	for (set<shared_ptr<Route> >::iterator i = existing.begin(); i != existing.end(); ++i) {

+	for (set<boost::shared_ptr<Route> >::iterator i = existing.begin(); i != existing.end(); ++i) {

 		r2 =* i;

 		/* r2 is a route that feeds r1 which somehow feeds base. mark

@@ -1651,14 +1650,14 @@ Session::resort_routes ()

 	{

 		RCUWriter<RouteList> writer (routes);

-		shared_ptr<RouteList> r = writer.get_copy ();

+		boost::shared_ptr<RouteList> r = writer.get_copy ();

 		resort_routes_using (r);

 		/* writer goes out of scope and forces update */

 	}

 }

 void

-Session::resort_routes_using (shared_ptr<RouteList> r)

+Session::resort_routes_using (boost::shared_ptr<RouteList> r)

 {

 	RouteList::iterator i, j;

@@ -1723,7 +1722,7 @@ Session::new_audio_track (int input_chan

 	/* count existing audio tracks */

 	{

-		shared_ptr<RouteList> r = routes.reader ();

+		boost::shared_ptr<RouteList> r = routes.reader ();

 		for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {

 			if (dynamic_cast<AudioTrack*>((*i).get()) != 0) {

@@ -1776,7 +1775,7 @@ Session::new_audio_track (int input_chan

 			nphysical_out = 0;

 		}

-		shared_ptr<AudioTrack> track;

+		boost::shared_ptr<AudioTrack> track;

 		try {

 			track = boost::shared_ptr<AudioTrack>((new AudioTrack (*this, track_name, Route::Flag (0), mode)));

@@ -1884,7 +1883,7 @@ Session::set_remote_control_ids ()

 {

 	RemoteModel m = Config->get_remote_model();

-	shared_ptr<RouteList> r = routes.reader ();

+	boost::shared_ptr<RouteList> r = routes.reader ();

 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {

 		if ( MixerOrdered == m) {			

@@ -1913,7 +1912,7 @@ Session::new_audio_route (int input_chan

 	/* count existing audio busses */

 	{

-		shared_ptr<RouteList> r = routes.reader ();

+		boost::shared_ptr<RouteList> r = routes.reader ();

 		for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {

 			if (dynamic_cast<AudioTrack*>((*i).get()) == 0) {

@@ -1945,7 +1944,7 @@ Session::new_audio_route (int input_chan

 		} while (bus_id < (UINT_MAX-1));

 		try {

-			shared_ptr<Route> bus (new Route (*this, bus_name, -1, -1, -1, -1, Route::Flag(0), DataType::AUDIO));

+			boost::shared_ptr<Route> bus (new Route (*this, bus_name, -1, -1, -1, -1, Route::Flag(0), DataType::AUDIO));

 			if (bus->ensure_io (input_channels, output_channels, false, this)) {

 				error << string_compose (_("cannot configure %1 in/%2 out configuration for new audio track"),

@@ -2060,7 +2059,7 @@ Session::new_route_from_template (uint32

 		Track::zero_diskstream_id_in_xml (node_copy);

 		try {

-			shared_ptr<Route> route (XMLRouteFactory (node_copy));

+			boost::shared_ptr<Route> route (XMLRouteFactory (node_copy));

 			if (route == 0) {

 				error << _("Session: cannot create track/bus from template description") << endmsg;

@@ -2107,7 +2106,7 @@ boost::shared_ptr<Route>

 Session::new_video_track (string name)

 {

 	uint32_t control_id = ntracks() + nbusses() + 1;

-	shared_ptr<Route> new_route (

+	boost::shared_ptr<Route> new_route (

 		new Route ( *this, name, -1, -1, -1, -1, Route::Flag(0), ARDOUR::DataType::NIL));

 	new_route->set_remote_control_id (control_id);

@@ -2115,7 +2114,7 @@ Session::new_video_track (string name)

 	rl.push_back (new_route);

         {

 		RCUWriter<RouteList> writer (routes);

-		shared_ptr<RouteList> r = writer.get_copy ();

+		boost::shared_ptr<RouteList> r = writer.get_copy ();

                 r->insert (r->end(), rl.begin(), rl.end());

 		resort_routes_using (r);

         }

@@ -2127,7 +2126,7 @@ Session::add_routes (RouteList& new_rout

 {

 	{ 

 		RCUWriter<RouteList> writer (routes);

-		shared_ptr<RouteList> r = writer.get_copy ();

+		boost::shared_ptr<RouteList> r = writer.get_copy ();

 		r->insert (r->end(), new_routes.begin(), new_routes.end());

 		resort_routes_using (r);

 	}

@@ -2150,7 +2149,7 @@ Session::add_routes (RouteList& new_rout

 		} 

 	}

-	if (_control_out && IO::connecting_legal) {

+	if (_control_out && IO::connecting_is_legal()) {

 		vector<string> cports;

 		uint32_t ni = _control_out->n_inputs();

@@ -2198,14 +2197,14 @@ Session::add_diskstream (boost::shared_p

 }

 void

-Session::remove_route (shared_ptr<Route> route)

+Session::remove_route (boost::shared_ptr<Route> route)

 {

 	//clear solos before removing the route

 	route->set_solo ( false, this);

 	{ 	

 		RCUWriter<RouteList> writer (routes);

-		shared_ptr<RouteList> rs = writer.get_copy ();

+		boost::shared_ptr<RouteList> rs = writer.get_copy ();

 		rs->remove (route);

@@ -2215,11 +2214,11 @@ Session::remove_route (shared_ptr<Route>

 		*/

 		if (route == _master_out) {

-			_master_out = shared_ptr<Route> ();

+			_master_out = boost::shared_ptr<Route> ();

 		}

 		if (route == _control_out) {

-			_control_out = shared_ptr<Route> ();

+			_control_out = boost::shared_ptr<Route> ();

 			/* cancel control outs for all routes */

@@ -2308,7 +2307,7 @@ Session::route_solo_changed (void* src, 

 	is_track = (boost::dynamic_pointer_cast<AudioTrack>(route) != 0);

-	shared_ptr<RouteList> r = routes.reader ();

+	boost::shared_ptr<RouteList> r = routes.reader ();

 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {

@@ -2404,7 +2403,7 @@ Session::update_route_solo_state ()

 	   the solo mute setting of each track.

 	*/

-	shared_ptr<RouteList> r = routes.reader ();

+	boost::shared_ptr<RouteList> r = routes.reader ();

         for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {

 		if ((*i)->soloed()) {

@@ -2446,7 +2445,7 @@ Session::update_route_solo_state ()

 void

 Session::modify_solo_mute (bool is_track, bool mute)

 {

-	shared_ptr<RouteList> r = routes.reader ();

+	boost::shared_ptr<RouteList> r = routes.reader ();

         for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {

@@ -2511,7 +2510,7 @@ Session::catch_up_on_solo_mute_override 

 	/* this is called whenever the param solo-mute-override is

 	   changed.

 	*/

-	shared_ptr<RouteList> r = routes.reader ();

+	boost::shared_ptr<RouteList> r = routes.reader ();

 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {

 		(*i)->catch_up_on_solo_mute_override ();

@@ -2521,7 +2520,7 @@ Session::catch_up_on_solo_mute_override 

 bool

 Session::io_name_is_legal (const std::string& name)

 {

-	shared_ptr<RouteList> r = routes.reader ();

+	boost::shared_ptr<RouteList> r = routes.reader ();

 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {

 		if ((*i)->name() == name) {

@@ -2536,10 +2535,10 @@ Session::io_name_is_legal (const std::st

 	return true;

 }

-shared_ptr<Route>

+boost::shared_ptr<Route>

 Session::route_by_name (const std::string& name)

 {

-	shared_ptr<RouteList> r = routes.reader ();

+	boost::shared_ptr<RouteList> r = routes.reader ();

 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {

 		if ((*i)->name() == name) {

@@ -2547,13 +2546,13 @@ Session::route_by_name (const std::strin

 		}

 	}

-	return shared_ptr<Route> ((Route*) 0);

+	return boost::shared_ptr<Route> ((Route*) 0);

 }

-shared_ptr<Route>

+boost::shared_ptr<Route>

 Session::route_by_id (PBD::ID id)

 {

-	shared_ptr<RouteList> r = routes.reader ();

+	boost::shared_ptr<RouteList> r = routes.reader ();

 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {

 		if ((*i)->id() == id) {

@@ -2561,13 +2560,13 @@ Session::route_by_id (PBD::ID id)

 		}

 	}

-	return shared_ptr<Route> ((Route*) 0);

+	return boost::shared_ptr<Route> ((Route*) 0);

 }

-shared_ptr<Route>

+boost::shared_ptr<Route>

 Session::route_by_remote_id (uint32_t id)

 {

-	shared_ptr<RouteList> r = routes.reader ();

+	boost::shared_ptr<RouteList> r = routes.reader ();

 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {

 		if ((*i)->remote_control_id() == id) {

@@ -2575,7 +2574,7 @@ Session::route_by_remote_id (uint32_t id

 		}

 	}

-	return shared_ptr<Route> ((Route*) 0);

+	return boost::shared_ptr<Route> ((Route*) 0);

 }

 void

@@ -3595,7 +3594,7 @@ Session::is_auditioning () const

 void

 Session::set_all_solo (bool yn)

 {

-	shared_ptr<RouteList> r = routes.reader ();

+	boost::shared_ptr<RouteList> r = routes.reader ();

 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {

 		if (!(*i)->hidden()) {

@@ -3609,7 +3608,7 @@ Session::set_all_solo (bool yn)

 void

 Session::set_all_mute (bool yn)

 {

-	shared_ptr<RouteList> r = routes.reader ();

+	boost::shared_ptr<RouteList> r = routes.reader ();

 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {

 		if (!(*i)->hidden()) {

@@ -3680,7 +3679,7 @@ Session::record_enable_all ()

 void

 Session::record_enable_change_all (bool yn)

 {

-	shared_ptr<RouteList> r = routes.reader ();

+	boost::shared_ptr<RouteList> r = routes.reader ();

 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {

 		AudioTrack* at;

@@ -4071,7 +4070,7 @@ Session::reset_native_file_format ()

 bool

 Session::route_name_unique (string n) const

 {

-	shared_ptr<RouteList> r = routes.reader ();

+	boost::shared_ptr<RouteList> r = routes.reader ();

 	for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {

 		if ((*i)->name() == n) {

@@ -4117,7 +4116,7 @@ Session::allocate_pan_automation_buffers

 int

 Session::freeze (InterThreadInfo& itt)

 {

-	shared_ptr<RouteList> r = routes.reader ();

+	boost::shared_ptr<RouteList> r = routes.reader ();

 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {

@@ -4355,7 +4354,7 @@ uint32_t 

 Session::ntracks () const

 {

 	uint32_t n = 0;

-	shared_ptr<RouteList> r = routes.reader ();

+	boost::shared_ptr<RouteList> r = routes.reader ();

 	for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {

 		if (dynamic_cast<AudioTrack*> ((*i).get())) {

@@ -4370,7 +4369,7 @@ uint32_t 

 Session::nbusses () const

 {

 	uint32_t n = 0;

-	shared_ptr<RouteList> r = routes.reader ();

+	boost::shared_ptr<RouteList> r = routes.reader ();

 	for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {

 		if (dynamic_cast<AudioTrack*> ((*i).get()) == 0) {

--- libs/fst/jackvst.h.orig	Wed Aug 30 22:49:25 2006

+++ libs/fst/jackvst.h	Sat Mar 24 16:58:18 2007

@@ -6,7 +6,9 @@

 #include <jack/jack.h>

 #include <jack/ringbuffer.h>

 #include <fst.h>

+#ifdef WITH_ALSA

 #include <alsa/asoundlib.h>

+#endif

 typedef struct _JackVST JackVST;

@@ -26,7 +28,9 @@

     /* For VST/i support */

     pthread_t          midi_thread;

+#ifdef WITH_ALSA

     snd_seq_t*         seq;

+#endif WITH_ALSA

     int                midiquit;

     jack_ringbuffer_t* event_queue;

     struct VstEvents*  events;

--- libs/fst/vsti.c.orig	Sat Mar 24 16:56:58 2007

+++ libs/fst/vsti.c	Sat Mar 24 16:59:07 2007

@@ -32,6 +32,8 @@

 #include <jackvst.h>

 #include <vst/aeffectx.h>

+#ifdef WITH_ALSA

+

 snd_seq_t *

 create_sequencer (const char* client_name, bool isinput)

 {

@@ -177,5 +179,5 @@

 	snd_seq_close (jvst->seq);

 }

-

+#endif

--- libs/midi++2/SConscript.orig	Sun Nov 12 16:24:06 2006

+++ libs/midi++2/SConscript	Wed Dec  6 00:49:53 2006

@@ -39,8 +39,7 @@

    midi2.Append (LINKFLAGS="-framework CoreMIDI")

    midi2.Append (LINKFLAGS="-framework CoreFoundation")

 else:

-   sysdep_src = [ 'alsa_sequencer_midiport.cc' ]

-   midi2.Append (CCFLAGS="-DWITH_ALSA")

+   sysdep_src = [ ]

 midi2.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")

 midi2.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")

--- libs/pbd/mountpoint.cc.orig

+++ libs/pbd/mountpoint.cc

@@ -19,7 +19,7 @@

 */

 #include <cstdio>

-#include <cstring>

+#include <cstdlib>

 #include <string>

 #include <cstring>

 #include <limits.h>

--- libs/pbd/pbd/stl_delete.h.orig

+++ libs/pbd/pbd/stl_delete.h

@@ -23,7 +23,7 @@

 /* To actually use any of these deletion functions, you need to

    first include the revelant container type header.

 */

-#if defined(_CPP_VECTOR) || defined(_GLIBCXX_VECTOR) || defined(__SGI_STL_VECTOR)

+#if defined(_LIBCPP_VECTOR) || defined(_GLIBCXX_VECTOR) || defined(__SGI_STL_VECTOR)

 template<class T> void vector_delete (std::vector<T *> *vec) 

 {

 	typename std::vector<T *>::iterator i;

@@ -33,7 +33,7 @@ template<class T> void vector_delete (st

 	}

 	vec->clear ();

 }

-#endif // _CPP_VECTOR || _GLIBCXX_VECTOR || __SGI_STL_VECTOR

+#endif // _LIBCPP_VECTOR || _GLIBCXX_VECTOR || __SGI_STL_VECTOR

 #if defined(_CPP_MAP) || defined(_GLIBCXX_MAP) || defined(__SGI_STL_MAP)

 template<class K, class T> void map_delete (std::map<K, T *> *m) 

--- libs/pbd/stacktrace.cc.orig	Thu Mar 29 18:26:37 2007

+++ libs/pbd/stacktrace.cc	Thu Mar 29 18:27:27 2007

@@ -3,7 +3,9 @@

 /* Obtain a backtrace and print it to stdout. */

-#ifdef HAVE_EXECINFO

+/* Without this change, ardourvst dies during startup with

+   'wine: could not load L"Z:\\usr\\local\\lib\\ardour2\\ardour_vst.exe.so": Bad EXE format for''. */

+#if 0

 #include <execinfo.h>

 #include <stdlib.h>

--- libs/surfaces/mackie/mackie_control_protocol.cc.orig

+++ libs/surfaces/mackie/mackie_control_protocol.cc

@@ -64,8 +64,6 @@ using namespace sigc;

 using namespace Mackie;

 using namespace PBD;

-using boost::shared_ptr;

-

 #include "i18n.h"

 MackieMidiBuilder builder;

@@ -200,7 +198,7 @@ MackieControlProtocol::port_for_id( uint

 // predicate for sort call in get_sorted_routes

 struct RouteByRemoteId

 {

-	bool operator () ( const shared_ptr<Route> & a, const shared_ptr<Route> & b ) const {

+	bool operator () ( const boost::shared_ptr<Route> & a, const boost::shared_ptr<Route> & b ) const {

 		return a->remote_control_id() < b->remote_control_id();

 	}

@@ -680,7 +678,7 @@ MackieControlProtocol::create_ports()

 	}

 }

-shared_ptr<Route>

+boost::shared_ptr<Route>

 MackieControlProtocol::master_route()

 {

 	boost::shared_ptr<IO> mo = session->master_out ();

commit b29f54fb6efcdb2facf0471bd8e24d8eea3231b0

Author: Paul Davis <paul@linuxaudiosystems.com>

Date:   Wed Feb 20 18:53:30 2013 +0000

    back-port tempo line assert fix from 3.0 to stop crashing under some relatively easy to hit conditions

    git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@14067 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc

index e8bd034..a373dec 100644

--- gtk2_ardour/tempo_lines.cc.orig

+++ gtk2_ardour/tempo_lines.cc

@@ -146,9 +146,8 @@ TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit

 			}

 			xpos = rint(((nframes64_t)(*i).frame) / (double)frames_per_unit);

-			if (inserted_last_time && !_lines.empty()) {

-				li = _lines.lower_bound(xpos); // first line >= xpos

-			}

+

+                        li = _lines.lower_bound(xpos); // first line >= xpos

 			line = (li != _lines.end()) ? li->second : NULL;

 			assert(!line || line->property_x1() == li->first);

@@ -215,33 +214,35 @@ TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit

 				// Create a new line

 			} else if (_lines.size() < needed || _lines.size() < MAX_CACHED_LINES) {

 				//cout << "*** CREATING LINE" << endl;

-				assert(_lines.find(xpos) == _lines.end());

-				line = new ArdourCanvas::SimpleLine (*_group);

-				line->property_x1() = xpos;

-				line->property_x2() = xpos;

-				line->property_y1() = 0.0;

-				line->property_y2() = _height;

-				line->property_color_rgba() = color;

-				_lines.insert(make_pair(xpos, line));

-				inserted_last_time = true;

+				if (_lines.find(xpos) == _lines.end()) {

+                                        line = new ArdourCanvas::SimpleLine (*_group);

+                                        line->property_x1() = xpos;

+                                        line->property_x2() = xpos;

+                                        line->property_y1() = 0.0;

+                                        line->property_y2() = _height;

+                                        line->property_color_rgba() = color;

+                                        _lines.insert(make_pair(xpos, line));

+                                        inserted_last_time = true;

+                                }

 				// Steal from the left

 			} else {

 				//cout << "*** STEALING FROM LEFT" << endl;

-				assert(_lines.find(xpos) == _lines.end());

-				Lines::iterator steal = _lines.begin();

-				line = steal->second;

-				_lines.erase(steal);

-				line->property_color_rgba() = color;

-				line->property_x1() = xpos;

-				line->property_x2() = xpos;

-				_lines.insert(make_pair(xpos, line));

-				inserted_last_time = true; // search next time

-				invalidated = true;

-                               

-				// Shift clean range right

-				_clean_left = max(_clean_left, steal->first);

-				_clean_right = max(_clean_right, xpos);

+				if (_lines.find(xpos) == _lines.end()) {

+                                        Lines::iterator steal = _lines.begin();

+                                        line = steal->second;

+                                        _lines.erase(steal);

+                                        line->property_color_rgba() = color;

+                                        line->property_x1() = xpos;

+                                        line->property_x2() = xpos;

+                                        _lines.insert(make_pair(xpos, line));

+                                        inserted_last_time = true; // search next time

+                                        invalidated = true;

+                                        

+                                        // Shift clean range right

+                                        _clean_left = max(_clean_left, steal->first);

+                                        _clean_right = max(_clean_right, xpos);

+                                }

 			}

 			break;

--- vst/SConscript.orig	Sat Mar 24 13:25:52 2007

+++ vst/SConscript	Sat Mar 24 13:26:42 2007

@@ -20,7 +20,7 @@

 )

 ardour_vst.Append (CCFLAGS="-DVST_SUPPORT", CPPPATH="#libs/fst", LIBPATH='#gtk2_ardour', LIBS="ardourgtk")

-ardour_vst.Append (LINKFLAGS='-L/usr/X11R6/lib -lasound -lX11 -lpthread') 

+#ardour_vst.Append (LINKFLAGS='-L/usr/X11R6/lib -lasound -lX11 -lpthread') 

 ardour_vst["CC"] ="winegcc"

 ardour_vst["LINK"] ="wineg++ -mwindows"

Ardour is a digital audio workstation.  You can use it to record, edit, and

mix multi-track audio.  Produce your own CD's.  Mix video soundtracks.

Experiment with new ideas about music and sound.  Generate sound

installations for 12 speaker gallery shows.

Ardour capabilities include: multichannel recording, non-linear, non-

destructive region based editing with unlimited undo/redo, full automation

support, a mixer whose capabilities rival high end hardware consoles, lots

of plugins to warp, shift, and shape your music, and controllable from

hardware control surfaces at the same time as it syncs to timecode.  If you

have been looking for a tool similar to ProTools, Nuendo, Cubase SX, Digital

Performer, Samplitude, or Sequoia, you might have found it.

WWW: http://ardour.org/

%%NO_VST%%bin/ardour2

%%VST%%bin/ardourvst

etc/ardour2/SAE-de-keypad.bindings

etc/ardour2/SAE-de-nokeypad.bindings

etc/ardour2/SAE-us-keypad.bindings

etc/ardour2/SAE-us-nokeypad.bindings

etc/ardour2/ardour-sae.menus

etc/ardour2/ardour.menus

etc/ardour2/ardour2_ui_dark.rc

etc/ardour2/ardour2_ui_dark_sae.rc

etc/ardour2/ardour2_ui_default.conf

etc/ardour2/ardour2_ui_light.rc

etc/ardour2/ardour2_ui_light_sae.rc

etc/ardour2/ardour_system.rc

etc/ardour2/ergonomic-us.bindings

etc/ardour2/mnemonic-us.bindings

%%NO_VST%%lib/ardour2/ardour-%%DISTVERSION%%

%%VST%%lib/ardour2/ardour_vst.exe.so

lib/ardour2/engines/libclearlooks.so

lib/ardour2/libardour.so

lib/ardour2/libardour_cp.so

%%VST%%lib/ardour2/libardourgtk.so

lib/ardour2/libgtkmm2ext.so

lib/ardour2/libmidi++.so

lib/ardour2/libpbd.so

lib/ardour2/librubberband.so

lib/ardour2/libvamphostsdk.so

lib/ardour2/libvampsdk.so

lib/ardour2/surfaces/libardour_genericmidi.so

lib/ardour2/surfaces/libardour_mackie.so

lib/ardour2/surfaces/libardour_tranzport.so

lib/ardour2/vamp/libardourvampplugins.so

share/ardour2/icons/application-x-ardour_16px.png

share/ardour2/icons/application-x-ardour_22px.png

share/ardour2/icons/application-x-ardour_32px.png

share/ardour2/icons/application-x-ardour_48px.png

share/ardour2/icons/ardour_icon_16px.png

share/ardour2/icons/ardour_icon_22px.png

share/ardour2/icons/ardour_icon_32px.png

share/ardour2/icons/ardour_icon_48px.png

share/ardour2/icons/computer_keyboard.png

share/ardour2/icons/computer_keyboard_active.png

share/ardour2/icons/crossfade-in-S1.png

share/ardour2/icons/crossfade-in-S2.png

share/ardour2/icons/crossfade-in-constant-power.png

share/ardour2/icons/crossfade-in-fast-cut.png

share/ardour2/icons/crossfade-in-linear.png

share/ardour2/icons/crossfade-in-long-cut.png

share/ardour2/icons/crossfade-in-short-cut.png

share/ardour2/icons/crossfade-in-slow-cut.png

share/ardour2/icons/crossfade-out-S1.png

share/ardour2/icons/crossfade-out-S2.png

share/ardour2/icons/crossfade-out-constant-power.png

share/ardour2/icons/crossfade-out-fast-cut.png

share/ardour2/icons/crossfade-out-linear.png

share/ardour2/icons/crossfade-out-long-cut.png

share/ardour2/icons/crossfade-out-short-cut.png

share/ardour2/icons/crossfade-out-slow-cut.png

share/ardour2/icons/fader_belt.png

share/ardour2/icons/fader_belt_h.png

share/ardour2/icons/ferret_02.png

share/ardour2/icons/grabber_edit_point.png

share/ardour2/icons/hide.png

share/ardour2/icons/nudge_left.png

share/ardour2/icons/nudge_right.png

share/ardour2/icons/record_normal_red.png

share/ardour2/icons/record_tape_red.png

share/ardour2/icons/sae.png

share/ardour2/icons/saelogo.png

share/ardour2/icons/strip_width.png

share/ardour2/icons/tool_audition.png

share/ardour2/icons/tool_gain.png

share/ardour2/icons/tool_object.png

share/ardour2/icons/tool_stretch.png

share/ardour2/icons/tool_zoom.png

share/ardour2/icons/transport_end.png

share/ardour2/icons/transport_loop.png

share/ardour2/icons/transport_play.png

share/ardour2/icons/transport_range.png

share/ardour2/icons/transport_record.png

share/ardour2/icons/transport_start.png

share/ardour2/icons/transport_stop.png

share/ardour2/icons/zoom_full.png

share/ardour2/icons/zoom_in.png

share/ardour2/icons/zoom_out.png

share/ardour2/pixmaps/forwardblarrow.xpm

share/ardour2/pixmaps/hiin.xpm

share/ardour2/pixmaps/hiout.xpm

share/ardour2/pixmaps/hslider00.xpm

share/ardour2/pixmaps/hslider01.xpm

share/ardour2/pixmaps/left_arrow.xpm

share/ardour2/pixmaps/linin.xpm

share/ardour2/pixmaps/linout.xpm

share/ardour2/pixmaps/loin.xpm

share/ardour2/pixmaps/loop.xpm

share/ardour2/pixmaps/loout.xpm

share/ardour2/pixmaps/lr.xpm

share/ardour2/pixmaps/regin.xpm

share/ardour2/pixmaps/regin2.xpm

share/ardour2/pixmaps/regout.xpm

share/ardour2/pixmaps/regout2.xpm

share/ardour2/pixmaps/revdblarrow.xpm

share/ardour2/pixmaps/right_arrow.xpm

share/ardour2/pixmaps/set-next-button.xpm

share/ardour2/pixmaps/small-round-button-01.xpm

share/ardour2/pixmaps/small_x.xpm

share/ardour2/pixmaps/toggle-button-00.xpm

share/ardour2/pixmaps/toggle-button-01.xpm

share/ardour2/pixmaps/tool_audition.xpm

share/ardour2/pixmaps/tool_gain.xpm

share/ardour2/pixmaps/tool_object.xpm

share/ardour2/pixmaps/tool_range.xpm

share/ardour2/pixmaps/tool_stretch.xpm

share/ardour2/pixmaps/tool_zoom.xpm

share/ardour2/pixmaps/vslider00.xpm

share/ardour2/pixmaps/vslider01.xpm

share/ardour2/pixmaps/vslider02_rail.xpm

share/ardour2/pixmaps/vslider02_slider.xpm

share/ardour2/pixmaps/vslider_slider_16wide.xpm

share/ardour2/pixmaps/zoom_full.xpm

share/ardour2/pixmaps/zoom_in.xpm

share/ardour2/pixmaps/zoom_out.xpm

share/ardour2/splash.png

share/ardour2/templates/16 Tracks.template

share/ardour2/templates/2 Track.template

share/ardour2/templates/32 Tracks.template

share/ardour2/templates/4 Tracks.template

share/ardour2/templates/8 Tracks.template

share/locale/cs/LC_MESSAGES/gtk2_ardour.mo

share/locale/de/LC_MESSAGES/gtk2_ardour.mo

share/locale/el/LC_MESSAGES/gtk2_ardour.mo

share/locale/el/LC_MESSAGES/libardour2.mo

share/locale/el/LC_MESSAGES/libgtkmm2ext.mo

share/locale/es/LC_MESSAGES/gtk2_ardour.mo

share/locale/es/LC_MESSAGES/libardour2.mo

share/locale/es/LC_MESSAGES/libgtkmm2ext.mo

share/locale/eu/LC_MESSAGES/gtk2_ardour.mo

share/locale/eu/LC_MESSAGES/libardour2.mo

share/locale/eu/LC_MESSAGES/libgtkmm2ext.mo

share/locale/fr/LC_MESSAGES/gtk2_ardour.mo

share/locale/fr/LC_MESSAGES/libardour2.mo

share/locale/it/LC_MESSAGES/gtk2_ardour.mo

share/locale/it/LC_MESSAGES/libardour2.mo

share/locale/nn/LC_MESSAGES/gtk2_ardour.mo

share/locale/nn/LC_MESSAGES/libardour2.mo

share/locale/nn/LC_MESSAGES/libgtkmm2ext.mo

share/locale/pl/LC_MESSAGES/gtk2_ardour.mo

share/locale/pl/LC_MESSAGES/libardour2.mo

share/locale/pl/LC_MESSAGES/libgtkmm2ext.mo

share/locale/pt/LC_MESSAGES/gtk2_ardour.mo

share/locale/pt/LC_MESSAGES/libgtkmm2ext.mo

share/locale/pt_PT/LC_MESSAGES/gtk2_ardour.mo

share/locale/ru/LC_MESSAGES/gtk2_ardour.mo

share/locale/ru/LC_MESSAGES/libardour2.mo

share/locale/ru/LC_MESSAGES/libgtkmm2ext.mo

share/locale/sv/LC_MESSAGES/gtk2_ardour.mo

share/locale/sv/LC_MESSAGES/libardour2.mo