View | Details | Raw Unified | Return to bug 222238
Collapse All | Expand All

(-)MOVED (+1 lines)
Lines 9543-9545 Link Here
9543
devel/py33-setuptools||2017-09-03|Removed, please update to Python 3.6
9543
devel/py33-setuptools||2017-09-03|Removed, please update to Python 3.6
9544
x11-toolkits/py33-tkinter||2017-09-03|Removed, please update to Python 3.6
9544
x11-toolkits/py33-tkinter||2017-09-03|Removed, please update to Python 3.6
9545
devel/py3-enum34||2017-09-03|Removed, Python 3.3 only
9545
devel/py3-enum34||2017-09-03|Removed, Python 3.3 only
9546
audio/ardour|audio/ardour2|2017-09-11|Renamed to free port name for tracking latest version which is currently named ardour5 
(-)audio/ardour/Makefile (-80 lines)
Lines 1-80 Link Here
1
# Created by: Edward Tomasz Napierala <trasz@pin.if.uz.zgora.pl>
2
# $FreeBSD$
3
4
PORTNAME=	ardour
5
PORTVERSION=	2.8.16
6
PORTREVISION=	6
7
CATEGORIES=	audio
8
MASTER_SITES=	http://freebsd.nsu.ru/distfiles/
9
10
MAINTAINER=	danfe@FreeBSD.org
11
COMMENT=	Multichannel digital audio workstation
12
13
LICENSE=	GPLv2
14
LICENSE_FILE=	${WRKSRC}/COPYING
15
16
BROKEN=		fails to build
17
18
LIB_DEPENDS=	liblo.so:audio/liblo \
19
		liblrdf.so:textproc/liblrdf \
20
		libjack.so:audio/jack \
21
		libaubio.so:audio/aubio \
22
		libfftw3.so:math/fftw3 \
23
		libfftw3f.so:math/fftw3-float \
24
		libboost_date_time.so:devel/boost-libs \
25
		libgnomecanvasmm-2.6.so:graphics/libgnomecanvasmm26
26
27
USES=		cpe gettext scons pkgconfig tar:bzip2
28
MAKE_ARGS+=	SYSLIBS=yes PREFIX=${PREFIX} NLS=yes
29
CFLAGS+=	-I${LOCALBASE}/include -DHAVE_AUBIO4
30
USE_GNOME=	libxslt
31
USE_LDCONFIG=	${PREFIX}/lib/ardour2 ${PREFIX}/lib/ardour2/surfaces
32
33
PLIST_SUB=	DISTVERSION=${DISTVERSION}
34
35
OPTIONS_DEFINE=	OPTIMIZED_CFLAGS VST
36
VST_DESC=	VST plugins support
37
38
BROKEN_powerpc64=	Does not build
39
40
.include <bsd.port.options.mk>
41
42
.if ${PORT_OPTIONS:MVST}
43
MAKE_ARGS+=	VST=yes
44
LIB_DEPENDS+=	libwine.so:emulators/wine
45
PLIST_SUB+=	NO_VST="@comment "
46
PLIST_SUB+=	VST=""
47
.else
48
PLIST_SUB+=	NO_VST=""
49
PLIST_SUB+=	VST="@comment "
50
.endif
51
52
# Upstream uses these flags by default
53
.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
54
CFLAGS+=	-O3 -fomit-frame-pointer -ffast-math -fstrength-reduce
55
.  if ${ARCH} == "amd64"
56
MAKE_ARGS+=	DIST_TARGET=x86_64
57
MAKE_ARGS+=	FPU_OPTIMIZATION=1
58
.  elif ${MACHINE_CPU:Msse}
59
MAKE_ARGS+=	DIST_TARGET=i686
60
MAKE_ARGS+=	FPU_OPTIMIZATION=1
61
.  else
62
MAKE_ARGS+=	DIST_TARGET=i386
63
MAKE_ARGS+=	FPU_OPTIMIZATION=0
64
.  endif
65
.else
66
MAKE_ARGS+=	FPU_OPTIMIZATION=0
67
.endif
68
69
post-patch:
70
	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/SConstruct
71
	@${REINPLACE_CMD} -e 's|alsa_pcm|oss|g' ${WRKSRC}/templates/*.template
72
	@${REINPLACE_CMD} -e 's|std::pair<double|std::pair<const double|' \
73
		${WRKSRC}/gtk2_ardour/tempo_lines.h
74
75
post-install:
76
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/ardour2/templates
77
	${INSTALL_DATA} ${WRKSRC}/templates/*.template \
78
		${STAGEDIR}${PREFIX}/share/ardour2/templates
79
80
.include <bsd.port.mk>
(-)audio/ardour/distinfo (-2 lines)
Lines 1-2 Link Here
1
SHA256 (ardour-2.8.16.tar.bz2) = 37ee32119ba105fa0883faa7e18c58ecd5276894568da224a554d9ef49075e40
2
SIZE (ardour-2.8.16.tar.bz2) = 2169916
(-)audio/ardour/files/patch-SConstruct (-69 lines)
Lines 1-69 Link Here
1
--- SConstruct.orig
2
+++ SConstruct
3
@@ -784,10 +784,7 @@ if env['FPU_OPTIMIZATION']:
4
 # handle x86/x86_64 libdir properly
5
 
6
 if env['DIST_LIBDIR'] == '':
7
-    if env['DIST_TARGET'] == 'x86_64':
8
-        env['LIBDIR']='lib64'
9
-    else:
10
-        env['LIBDIR']='lib'
11
+    env['LIBDIR']='lib'
12
 else:
13
     env['LIBDIR'] = env['DIST_LIBDIR']
14
 
15
@@ -838,13 +835,7 @@ if env['ARCH'] != '':
16
 # prepend boiler plate optimization flags
17
 #
18
 
19
-opt_flags[:0] = [
20
-    "-O3",
21
-    "-fomit-frame-pointer",
22
-    "-ffast-math",
23
-    "-fstrength-reduce",
24
-    "-pipe"
25
-    ]
26
+opt_flags[:0] = [ "%%CFLAGS%%" ];
27
 
28
 if env['DEBUG'] == 1:
29
     env.Append(CCFLAGS=" ".join (debug_flags))
30
@@ -954,6 +945,7 @@ conf.Finish()
31
 
32
 libraries['usb'] = LibraryInfo ()
33
 prep_libcheck(env, libraries['usb'])
34
+libraries['usb'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib")
35
 
36
 conf = Configure (libraries['usb'])
37
 if conf.CheckLib ('usb', 'usb_interrupt_write'):
38
@@ -1005,6 +997,7 @@ libraries['boost'] = conf.Finish ()
39
 
40
 libraries['dmalloc'] = LibraryInfo ()
41
 prep_libcheck(env, libraries['dmalloc'])
42
+libraries['dmalloc'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib")
43
 
44
 #
45
 # look for the threaded version
46
@@ -1062,8 +1055,10 @@ elif conf.CheckCHeader('/System/Library/
47
     subst_dict['%MIDITAG%'] = "ardour"
48
     subst_dict['%MIDITYPE%'] = "coremidi"
49
 else:
50
-    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."
51
-    sys.exit (1)
52
+    libraries['sysmidi'] = LibraryInfo ()
53
+    env['SYSMIDI'] = 'none'
54
+    subst_dict['%MIDITAG%'] = "none"
55
+    subst_dict['%MIDITYPE%'] = "none"
56
 
57
 pname = env['PROGRAM_NAME']
58
 subst_dict['%MIDI_DEVICE_NAME%'] = pname.lower()
59
@@ -1349,8 +1344,8 @@ if conf.CheckCHeader('/System/Library/Fr
60
     subst_dict['%JACK_INPUT%'] = "coreaudio:Built-in Audio:in"
61
     subst_dict['%JACK_OUTPUT%'] = "coreaudio:Built-in Audio:out"
62
 else:
63
-    subst_dict['%JACK_INPUT%'] = "alsa_pcm:playback_"
64
-    subst_dict['%JACK_OUTPUT%'] = "alsa_pcm:capture_"
65
+    subst_dict['%JACK_INPUT%'] = "oss:playback_"
66
+    subst_dict['%JACK_OUTPUT%'] = "oss:capture_"
67
 
68
 # posix_memalign available
69
 if not conf.CheckFunc('posix_memalign'):
(-)audio/ardour/files/patch-aubio4 (-340 lines)
Lines 1-340 Link Here
1
commit 1eaa30b7257f006878c9b2c88ecbaea5bc36b174
2
Author: Robin Gareus <robin@gareus.org>
3
Date:   Sun Jan 12 18:11:14 2014 +0100
4
5
    aubio 3+4 compat
6
7
diff --git libs/vamp-plugins/Onset.cpp libs/vamp-plugins/Onset.cpp
8
index d475b11..196ca29 100644
9
--- libs/vamp-plugins/Onset.cpp
10
+++ libs/vamp-plugins/Onset.cpp
11
@@ -22,29 +22,51 @@ using std::vector;
12
 using std::cerr;
13
 using std::endl;
14
 
15
+#ifdef HAVE_AUBIO4
16
+const char *getAubioNameForOnsetType(OnsetType t)
17
+{
18
+    // In the same order as the enum elements in the header
19
+    static const char *const names[] = {
20
+        "energy", "specdiff", "hfc", "complex", "phase", "kl", "mkl", "specflux"
21
+    };
22
+    return names[(int)t];
23
+}
24
+#endif
25
+
26
 Onset::Onset(float inputSampleRate) :
27
     Plugin(inputSampleRate),
28
     m_ibuf(0),
29
-    m_fftgrain(0),
30
     m_onset(0),
31
+#ifdef HAVE_AUBIO4
32
+    m_onsetdet(0),
33
+    m_onsettype(OnsetComplex),
34
+    m_minioi(4),
35
+    m_silence(-70),
36
+#else
37
+    m_fftgrain(0),
38
     m_pv(0),
39
     m_peakpick(0),
40
     m_onsetdet(0),
41
     m_onsettype(aubio_onset_complex),
42
-    m_threshold(0.3),
43
+    m_channelCount(1),
44
     m_silence(-90),
45
-    m_channelCount(1)
46
+#endif
47
+    m_threshold(0.3)
48
 {
49
 }
50
 
51
 Onset::~Onset()
52
 {
53
+#ifdef HAVE_AUBIO4
54
+    if (m_onsetdet) del_aubio_onset(m_onsetdet);
55
+#else
56
     if (m_onsetdet) aubio_onsetdetection_free(m_onsetdet);
57
-    if (m_ibuf) del_fvec(m_ibuf);
58
-    if (m_onset) del_fvec(m_onset);
59
     if (m_fftgrain) del_cvec(m_fftgrain);
60
     if (m_pv) del_aubio_pvoc(m_pv);
61
     if (m_peakpick) del_aubio_peakpicker(m_peakpick);
62
+#endif
63
+    if (m_ibuf) del_fvec(m_ibuf);
64
+    if (m_onset) del_fvec(m_onset);
65
 }
66
 
67
 string
68
@@ -74,7 +96,11 @@ Onset::getMaker() const
69
 int
70
 Onset::getPluginVersion() const
71
 {
72
+#ifdef HAVE_AUBIO4
73
+    return 2;
74
+#else
75
     return 1;
76
+#endif
77
 }
78
 
79
 string
80
@@ -86,10 +112,20 @@ Onset::getCopyright() const
81
 bool
82
 Onset::initialise(size_t channels, size_t stepSize, size_t blockSize)
83
 {
84
-    m_channelCount = channels;
85
     m_stepSize = stepSize;
86
     m_blockSize = blockSize;
87
 
88
+#ifdef HAVE_AUBIO4
89
+    if (channels != 1) {
90
+        std::cerr << "Onset::initialise: channels must be 1" << std::endl;
91
+        return false;
92
+    }
93
+    m_ibuf = new_fvec(stepSize);
94
+    m_onset = new_fvec(1);
95
+    reset();
96
+#else
97
+    m_channelCount = channels;
98
+
99
     m_ibuf = new_fvec(stepSize, channels);
100
     m_onset = new_fvec(1, channels);
101
     m_fftgrain = new_cvec(blockSize, channels);
102
@@ -103,13 +139,32 @@ Onset::initialise(size_t channels, size_t stepSize, size_t blockSize)
103
 
104
     m_lastOnset = Vamp::RealTime::zeroTime - m_delay - m_delay;
105
 
106
+#endif
107
     return true;
108
 }
109
 
110
+#ifdef HAVE_AUBIO4
111
 void
112
 Onset::reset()
113
 {
114
+    if (m_onsetdet) del_aubio_onset(m_onsetdet);
115
+
116
+    m_onsetdet = new_aubio_onset
117
+        (const_cast<char *>(getAubioNameForOnsetType(m_onsettype)),
118
+         m_blockSize,
119
+         m_stepSize,
120
+         lrintf(m_inputSampleRate));
121
+    
122
+    aubio_onset_set_threshold(m_onsetdet, m_threshold);
123
+    aubio_onset_set_silence(m_onsetdet, m_silence);
124
+    aubio_onset_set_minioi(m_onsetdet, m_minioi);
125
+
126
+    m_delay = Vamp::RealTime::frame2RealTime(4 * m_stepSize,
127
+                                             lrintf(m_inputSampleRate));
128
+
129
+    m_lastOnset = Vamp::RealTime::zeroTime - m_delay - m_delay;
130
 }
131
+#endif
132
 
133
 size_t
134
 Onset::getPreferredStepSize() const
135
@@ -132,8 +187,13 @@ Onset::getParameterDescriptors() const
136
     desc.identifier = "onsettype";
137
     desc.name = "Onset Detection Function Type";
138
     desc.minValue = 0;
139
+#ifdef HAVE_AUBIO4
140
+    desc.maxValue = 7;
141
+    desc.defaultValue = (int)OnsetComplex;
142
+#else
143
     desc.maxValue = 6;
144
     desc.defaultValue = (int)aubio_onset_complex;
145
+#endif
146
     desc.isQuantized = true;
147
     desc.quantizeStep = 1;
148
     desc.valueNames.push_back("Energy Based");
149
@@ -143,6 +203,9 @@ Onset::getParameterDescriptors() const
150
     desc.valueNames.push_back("Phase Deviation");
151
     desc.valueNames.push_back("Kullback-Liebler");
152
     desc.valueNames.push_back("Modified Kullback-Liebler");
153
+#ifdef HAVE_AUBIO4
154
+    desc.valueNames.push_back("Spectral Flux");
155
+#endif
156
     list.push_back(desc);
157
 
158
     desc = ParameterDescriptor();
159
@@ -159,11 +222,27 @@ Onset::getParameterDescriptors() const
160
     desc.name = "Silence Threshold";
161
     desc.minValue = -120;
162
     desc.maxValue = 0;
163
+#ifdef HAVE_AUBIO4
164
+    desc.defaultValue = -70;
165
+#else
166
     desc.defaultValue = -90;
167
+#endif
168
     desc.unit = "dB";
169
     desc.isQuantized = false;
170
     list.push_back(desc);
171
 
172
+#ifdef HAVE_AUBIO4
173
+    desc = ParameterDescriptor();
174
+    desc.identifier = "minioi";
175
+    desc.name = "Minimum Inter-Onset Interval";
176
+    desc.minValue = 0;
177
+    desc.maxValue = 40;
178
+    desc.defaultValue = 4;
179
+    desc.unit = "ms";
180
+    desc.isQuantized = true;
181
+    desc.quantizeStep = 1;
182
+    list.push_back(desc);
183
+#endif
184
     return list;
185
 }
186
 
187
@@ -176,6 +255,10 @@ Onset::getParameter(std::string param) const
188
         return m_threshold;
189
     } else if (param == "silencethreshold") {
190
         return m_silence;
191
+#ifdef HAVE_AUBIO4
192
+    } else if (param == "minioi") {
193
+        return m_minioi;
194
+#endif
195
     } else {
196
         return 0.0;
197
     }
198
@@ -186,6 +269,16 @@ Onset::setParameter(std::string param, float value)
199
 {
200
     if (param == "onsettype") {
201
         switch (lrintf(value)) {
202
+#ifdef HAVE_AUBIO4
203
+        case 0: m_onsettype = OnsetEnergy; break;
204
+        case 1: m_onsettype = OnsetSpecDiff; break;
205
+        case 2: m_onsettype = OnsetHFC; break;
206
+        case 3: m_onsettype = OnsetComplex; break;
207
+        case 4: m_onsettype = OnsetPhase; break;
208
+        case 5: m_onsettype = OnsetKL; break;
209
+        case 6: m_onsettype = OnsetMKL; break;
210
+        case 7: m_onsettype = OnsetSpecFlux; break;
211
+#else
212
         case 0: m_onsettype = aubio_onset_energy; break;
213
         case 1: m_onsettype = aubio_onset_specdiff; break;
214
         case 2: m_onsettype = aubio_onset_hfc; break;
215
@@ -193,11 +286,16 @@ Onset::setParameter(std::string param, float value)
216
         case 4: m_onsettype = aubio_onset_phase; break;
217
         case 5: m_onsettype = aubio_onset_kl; break;
218
         case 6: m_onsettype = aubio_onset_mkl; break;
219
+#endif
220
         }
221
     } else if (param == "peakpickthreshold") {
222
         m_threshold = value;
223
     } else if (param == "silencethreshold") {
224
         m_silence = value;
225
+#ifdef HAVE_AUBIO4
226
+    } else if (param == "minioi") {
227
+        m_minioi = value;
228
+#endif
229
     }
230
 }
231
 
232
@@ -216,6 +314,7 @@ Onset::getOutputDescriptors() const
233
     d.sampleRate = 0;
234
     list.push_back(d);
235
 
236
+#ifndef HAVE_AUBIO4
237
     d = OutputDescriptor();
238
     d.identifier = "detectionfunction";
239
     d.name = "Onset Detection Function";
240
@@ -226,7 +325,7 @@ Onset::getOutputDescriptors() const
241
     d.isQuantized = false;
242
     d.sampleType = OutputDescriptor::OneSamplePerStep;
243
     list.push_back(d);
244
-
245
+#endif
246
     return list;
247
 }
248
 
249
@@ -234,6 +333,15 @@ Onset::FeatureSet
250
 Onset::process(const float *const *inputBuffers,
251
                Vamp::RealTime timestamp)
252
 {
253
+#ifdef HAVE_AUBIO4
254
+    for (size_t i = 0; i < m_stepSize; ++i) {
255
+        fvec_set_sample(m_ibuf, inputBuffers[0][i], i);
256
+    }
257
+
258
+    aubio_onset_do(m_onsetdet, m_ibuf, m_onset);
259
+
260
+    bool isonset = m_onset->data[0];
261
+#else
262
     for (size_t i = 0; i < m_stepSize; ++i) {
263
         for (size_t j = 0; j < m_channelCount; ++j) {
264
             fvec_write_sample(m_ibuf, inputBuffers[j][i], j, i);
265
@@ -250,6 +358,7 @@ Onset::process(const float *const *inputBuffers,
266
             isonset = false;
267
         }
268
     }
269
+#endif
270
 
271
     FeatureSet returnFeatures;
272
 
273
@@ -263,11 +372,13 @@ Onset::process(const float *const *inputBuffers,
274
             m_lastOnset = timestamp;
275
         }
276
     }
277
+#ifndef HAVE_AUBIO4
278
     Feature feature;
279
     for (size_t j = 0; j < m_channelCount; ++j) {
280
         feature.values.push_back(m_onset->data[j][0]);
281
     }
282
     returnFeatures[1].push_back(feature);
283
+#endif
284
 
285
     return returnFeatures;
286
 }
287
diff --git libs/vamp-plugins/Onset.h libs/vamp-plugins/Onset.h
288
index 314e107..bba95e0 100644
289
--- libs/vamp-plugins/Onset.h
290
+++ libs/vamp-plugins/Onset.h
291
@@ -20,6 +20,19 @@
292
 #include <vamp-sdk/Plugin.h>
293
 #include <aubio/aubio.h>
294
 
295
+#ifdef HAVE_AUBIO4
296
+enum OnsetType {
297
+    OnsetEnergy,
298
+    OnsetSpecDiff,
299
+    OnsetHFC,
300
+    OnsetComplex,
301
+    OnsetPhase,
302
+    OnsetKL,
303
+    OnsetMKL,
304
+    OnsetSpecFlux // new in 0.4!
305
+};
306
+#endif
307
+
308
 class Onset : public Vamp::Plugin
309
 {
310
 public:
311
@@ -54,20 +67,25 @@ public:
312
 
313
 protected:
314
     fvec_t *m_ibuf;
315
-    cvec_t *m_fftgrain;
316
     fvec_t *m_onset;
317
+#ifdef HAVE_AUBIO4
318
+    aubio_onset_t *m_onsetdet;
319
+    OnsetType m_onsettype;
320
+    float m_minioi;
321
+#else
322
+    cvec_t *m_fftgrain;
323
     aubio_pvoc_t *m_pv;
324
     aubio_pickpeak_t *m_peakpick;
325
     aubio_onsetdetection_t *m_onsetdet;
326
     aubio_onsetdetection_type m_onsettype;
327
-    float m_threshold;
328
+    size_t m_channelCount;
329
+#endif
330
     float m_silence;
331
+    float m_threshold;
332
     size_t m_stepSize;
333
     size_t m_blockSize;
334
-    size_t m_channelCount;
335
     Vamp::RealTime m_delay;
336
     Vamp::RealTime m_lastOnset;
337
 };
338
 
339
-
340
 #endif
(-)audio/ardour/files/patch-boost-1.52 (-13 lines)
Lines 1-13 Link Here
1
--- SConstruct.orig      2012-11-21 00:30:54.000000000 +0100
2
+++ SConstruct  2012-11-21 17:34:02.000000000 +0100
3
@@ -955,7 +961,9 @@
4
 # FLAC ....
5
 #
6
7
-# boost (we don't link against boost, just use some header files)
8
+# boost (we need to link against boost with >=1.50. header files alone will not work anymore)
9
+
10
+env.Append(LIBS=['boost_system'])
11
12
 libraries['boost'] = LibraryInfo ()
13
 prep_libcheck(env, libraries['boost'])
(-)audio/ardour/files/patch-gtk2__ardour_automation__selectable.h (-11 lines)
Lines 1-11 Link Here
1
--- gtk2_ardour/automation_selectable.h.orig	2009-02-24 12:37:42 UTC
2
+++ gtk2_ardour/automation_selectable.h
3
@@ -36,7 +36,7 @@ struct AutomationSelectable : public Sel
4
     AutomationSelectable (nframes_t s, nframes_t e, double l, double h, TimeAxisView& atv)
5
 	    : start (s), end (e), low_fract (l), high_fract (h), track (atv) {}
6
 
7
-    bool operator== (const AutomationSelectable& other) {
8
+    bool operator== (const AutomationSelectable& other) const {
9
 	    return start == other.start &&
10
 		    end == other.end &&
11
 		    low_fract == other.low_fract &&
(-)audio/ardour/files/patch-gtk2_ardour-SConscript (-14 lines)
Lines 1-14 Link Here
1
--- gtk2_ardour/SConscript.orig
2
+++ gtk2_ardour/SConscript
3
@@ -411,9 +411,9 @@ for style in ['', 'BOLD', 'ITALIC']:
4
 # 
5
 
6
 if env['GTKOSX']:
7
-	ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P -DGTKOSX -DTOP_MENUBAR ardour.menus.in ardour.menus", chdir=1)
8
+	ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P -DGTKOSX -DTOP_MENUBAR -o ardour.menus ardour.menus.in", chdir=1)
9
 else:
10
-	ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P ardour.menus.in ardour.menus", chdir=1)
11
+	ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P -o ardour.menus ardour.menus.in", chdir=1)
12
 
13
 ardour_dark_theme = env.SubstInFile ('ardour2_ui_dark.rc', 'ardour2_ui_dark.rc.in', SUBST_DICT = my_font_dict)
14
 ardour_light_theme = env.SubstInFile ('ardour2_ui_light.rc', 'ardour2_ui_light.rc.in', SUBST_DICT = my_font_dict)
(-)audio/ardour/files/patch-gtk2_ardour-ardour_ui.cc (-33 lines)
Lines 1-33 Link Here
1
--- gtk2_ardour/ardour_ui.cc.orig
2
+++ gtk2_ardour/ardour_ui.cc
3
@@ -31,6 +31,8 @@
4
 #include <iostream>
5
 
6
 #include <sys/resource.h>
7
+#include <sys/types.h>
8
+#include <sys/sysctl.h>
9
 
10
 #include <gtkmm/messagedialog.h>
11
 #include <gtkmm/accelmap.h>
12
@@ -696,8 +698,11 @@ ARDOUR_UI::check_memory_locking ()
13
 		struct rlimit limits;
14
 		int64_t ram;
15
 		long pages, page_size;
16
+		size_t pages_len=sizeof(pages);
17
+
18
+		if ((page_size = getpagesize()) < 0 ||
19
+			sysctlbyname("hw.availpages", &pages, &pages_len, NULL, 0)) {
20
 
21
-		if ((page_size = sysconf (_SC_PAGESIZE)) < 0 ||(pages = sysconf (_SC_PHYS_PAGES)) < 0) {
22
 			ram = 0;
23
 		} else {
24
 			ram = (int64_t) pages * (int64_t) page_size;
25
@@ -716,7 +721,7 @@ ARDOUR_UI::check_memory_locking ()
26
 								     "This might cause %1 to run out of memory before your system "
27
 								     "runs out of memory. \n\n"
28
 								     "You can view the memory limit with 'ulimit -l', "
29
-								     "and it is normally controlled by /etc/security/limits.conf"), PROGRAM_NAME));
30
+								     "and it is normally controlled by /etc/login.conf"), PROGRAM_NAME));
31
 						   
32
 				VBox* vbox = msg.get_vbox();
33
 				HBox hbox;
(-)audio/ardour/files/patch-gtk2_ardour-connection_editor.cc (-23 lines)
Lines 1-23 Link Here
1
--- gtk2_ardour/connection_editor.cc.orig
2
+++ gtk2_ardour/connection_editor.cc
3
@@ -502,9 +502,9 @@ ConnectionEditor::display_connection_sta
4
 	frame_label += _("\"");
5
 	port_frame.set_label (frame_label);
6
 
7
-	for (slist<ScrolledWindow *>::iterator i = port_displays.begin(); i != port_displays.end(); ) {
8
+	for (boost::container::slist<ScrolledWindow *>::iterator i = port_displays.begin(); i != port_displays.end(); ) {
9
 		
10
-		slist<ScrolledWindow *>::iterator tmp;
11
+		boost::container::slist<ScrolledWindow *>::iterator tmp;
12
 
13
 		tmp = i;
14
 		tmp++;
15
@@ -612,7 +612,7 @@ ConnectionEditor::connection_port_button
16
 
17
 		tview->set_name ("ConnectionEditorPortListSelected");
18
 
19
-		for (slist<ScrolledWindow *>::iterator i = port_displays.begin(); i != port_displays.end(); ++i) {
20
+		for (boost::container::slist<ScrolledWindow *>::iterator i = port_displays.begin(); i != port_displays.end(); ++i) {
21
 
22
 			Widget *child = (*i)->get_child();
23
 
(-)audio/ardour/files/patch-gtk2_ardour-connection_editor.h (-25 lines)
Lines 1-25 Link Here
1
--- gtk2_ardour/connection_editor.h.orig
2
+++ gtk2_ardour/connection_editor.h
3
@@ -20,12 +20,7 @@
4
 #ifndef __ardour_gtk_connection_editor_h__
5
 #define __ardour_gtk_connection_editor_h__
6
 
7
-#if __GNUC__ >= 3
8
-#include <ext/slist>
9
-using __gnu_cxx::slist;
10
-#else
11
-#include <slist.h>
12
-#endif
13
+#include <boost/container/slist.hpp>
14
 
15
 #include <gtkmm/box.h>
16
 #include <gtkmm/window.h>
17
@@ -116,7 +111,7 @@ class ConnectionEditor : public ArdourDi
18
 	Gtk::Button add_port_button;
19
 
20
 	Glib::Mutex port_display_lock;
21
-	slist<Gtk::ScrolledWindow *> port_displays;
22
+	boost::container::slist<Gtk::ScrolledWindow *> port_displays;
23
 
24
 	Gtk::Button ok_button;
25
 	Gtk::Button cancel_button;
(-)audio/ardour/files/patch-gtk2_ardour-engine_dialog.cc (-121 lines)
Lines 1-121 Link Here
1
--- gtk2_ardour/engine_dialog.cc.orig	2008-04-09 23:17:02.000000000 +0200
2
+++ gtk2_ardour/engine_dialog.cc	2008-04-10 18:53:32.000000000 +0200
3
@@ -12,7 +12,7 @@
4
 #include <CoreFoundation/CFString.h>
5
 #include <sys/param.h>
6
 #include <mach-o/dyld.h>
7
-#else
8
+#elif !defined(__FreeBSD__)
9
 #include <alsa/asoundlib.h>
10
 #endif
11
 
12
@@ -113,7 +113,9 @@
13
 #ifdef __APPLE__
14
 	strings.push_back (X_("CoreAudio"));
15
 #else
16
+#ifndef __FreeBSD__
17
 	strings.push_back (X_("ALSA"));
18
+#endif
19
 	strings.push_back (X_("OSS"));
20
 	strings.push_back (X_("FFADO"));
21
 #endif
22
@@ -158,7 +160,7 @@
23
 	basic_packer.attach (period_size_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
24
 	row++;
25
 
26
-#ifndef __APPLE__
27
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
28
 	label = manage (new Label (_("Number of buffers")));
29
 	basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
30
 	basic_packer.attach (periods_spinner, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
31
@@ -179,7 +181,7 @@
32
 	row++;
33
 	/* no audio mode with CoreAudio, its duplex or nuthin' */
34
 
35
-#ifndef __APPLE__
36
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
37
 	label = manage (new Label (_("Audio Mode")));
38
 	basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
39
 	basic_packer.attach (audio_mode_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
40
@@ -218,7 +220,7 @@
41
 	realtime_button.signal_toggled().connect (mem_fun (*this, &EngineControl::realtime_changed));
42
 	realtime_changed ();
43
 
44
-#ifndef __APPLE__
45
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
46
 	label = manage (new Label (_("Realtime Priority")));
47
 	label->set_alignment (1.0, 0.5);
48
 	options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
49
@@ -268,7 +270,7 @@
50
 	options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
51
 	++row;
52
 
53
-#ifndef __APPLE__
54
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
55
 	label = manage (new Label (_("Dither")));	
56
 	label->set_alignment (1.0, 0.5);
57
 	options_packer.attach (dither_mode_combo, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));
58
@@ -299,7 +301,7 @@
59
 	device_packer.set_spacings (6);
60
 	row = 0;
61
 
62
-#ifndef __APPLE__
63
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
64
 	label = manage (new Label (_("Input device")));
65
 	label->set_alignment (1.0, 0.5);
66
 	device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0);
67
@@ -570,7 +572,7 @@
68
 void
69
 EngineControl::realtime_changed ()
70
 {
71
-#ifndef __APPLE__
72
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
73
 	priority_spinner.set_sensitive (realtime_button.get_active());
74
 #endif
75
 }
76
@@ -586,8 +588,10 @@
77
 #endif
78
 
79
 #ifndef __APPLE__
80
+#ifndef __FreeBSD__
81
 	} else if (driver == "ALSA") {
82
 		devices[driver] = enumerate_alsa_devices ();
83
+#endif
84
 	} else if (driver == "FFADO") {
85
 		devices[driver] = enumerate_ffado_devices ();
86
 	} else if (driver == "OSS") {
87
@@ -714,6 +718,7 @@
88
 	return devs;
89
 }
90
 #else
91
+#ifndef __FreeBSD__
92
 vector<string>
93
 EngineControl::enumerate_alsa_devices ()
94
 {
95
@@ -774,6 +779,7 @@
96
 
97
 	return devs;
98
 }
99
+#endif
100
 
101
 vector<string>
102
 EngineControl::enumerate_ffado_devices ()
103
@@ -816,7 +822,9 @@
104
 	vector<string>& strings = devices[driver];
105
 
106
 	if (strings.empty() && driver != "FFADO" && driver != "Dummy") {
107
+#if 0
108
 		error << string_compose (_("No devices found for driver \"%1\""), driver) << endmsg;
109
+#endif
110
 		return;
111
 	}
112
 	
113
@@ -862,7 +870,7 @@
114
 EngineControl::redisplay_latency ()
115
 {
116
 	uint32_t rate = get_rate();
117
-#ifdef __APPLE_
118
+#if defined(__APPLE_) || defined(__FreeBSD__)
119
 	float periods = 2;
120
 #else
121
 	float periods = periods_adjustment.get_value();
(-)audio/ardour/files/patch-gtk2_ardour-io_selector.cc (-39 lines)
Lines 1-39 Link Here
1
--- gtk2_ardour/io_selector.cc.orig
2
+++ gtk2_ardour/io_selector.cc
3
@@ -389,9 +389,9 @@ IOSelector::display_ports ()
4
 			limit = io->n_outputs();
5
 		}
6
 		
7
-		for (slist<TreeView *>::iterator i = port_displays.begin(); i != port_displays.end(); ) {
8
+		for (boost::container::slist<TreeView *>::iterator i = port_displays.begin(); i != port_displays.end(); ) {
9
 			
10
-			slist<TreeView *>::iterator tmp;
11
+			boost::container::slist<TreeView *>::iterator tmp;
12
 			
13
 			tmp = i;
14
 			++tmp;
15
@@ -632,13 +632,13 @@ IOSelector::connection_button_release (G
16
 void
17
 IOSelector::select_next_treeview ()
18
 {
19
-	slist<TreeView*>::iterator next;
20
+	boost::container::slist<TreeView*>::iterator next;
21
 
22
 	if (port_displays.empty() || port_displays.size() == 1) {
23
 		return;
24
 	}
25
 
26
-	for (slist<TreeView *>::iterator i = port_displays.begin(); i != port_displays.end(); ++i) {
27
+	for (boost::container::slist<TreeView *>::iterator i = port_displays.begin(); i != port_displays.end(); ++i) {
28
 
29
 		if ((*i)->get_name() == "IOSelectorPortListSelected") {
30
 
31
@@ -681,7 +681,7 @@ IOSelector::select_treeview (TreeView* t
32
 		gtk_widget_queue_draw (ccol->button);
33
 	}
34
 
35
-	for (slist<TreeView*>::iterator i = port_displays.begin(); i != port_displays.end(); ++i) {
36
+	for (boost::container::slist<TreeView*>::iterator i = port_displays.begin(); i != port_displays.end(); ++i) {
37
 		if (*i == tview) {
38
 			continue;
39
 		}
(-)audio/ardour/files/patch-gtk2_ardour-io_selector.h (-25 lines)
Lines 1-25 Link Here
1
--- gtk2_ardour/io_selector.h.orig
2
+++ gtk2_ardour/io_selector.h
3
@@ -20,12 +20,7 @@
4
 #ifndef __ardour_ui_io_selector_h__
5
 #define __ardour_ui_io_selector_h__
6
 
7
-#if __GNUC__ >= 3
8
-#include <ext/slist>
9
-using __gnu_cxx::slist;
10
-#else
11
-#include <slist.h>
12
-#endif
13
+#include <boost/container/slist.hpp>
14
 
15
 #include <string>
16
 
17
@@ -110,7 +105,7 @@ class IOSelector : public Gtk::VBox {
18
 	Gtk::ScrolledWindow port_display_scroller;
19
 
20
 	Glib::Mutex port_display_lock;
21
-	slist<Gtk::TreeView *> port_displays;
22
+	boost::container::slist<Gtk::TreeView *> port_displays;
23
 	void display_ports ();
24
 
25
 	void rescan ();
(-)audio/ardour/files/patch-gtk2_ardour-new_session_dialog.cc (-11 lines)
Lines 1-11 Link Here
1
--- gtk2_ardour/new_session_dialog.cc.orig	2008-01-14 10:04:17.000000000 +0100
2
+++ gtk2_ardour/new_session_dialog.cc	2008-01-14 10:04:44.000000000 +0100
3
@@ -556,7 +556,7 @@
4
 	*/
5
 
6
 
7
-#ifdef __APPLE__
8
+#ifndef __Linux__
9
 
10
 	char buf[PATH_MAX];
11
 
(-)audio/ardour/files/patch-libs-ardour-ardour-io.h (-13 lines)
Lines 1-13 Link Here
1
--- libs/ardour/ardour/io.h.orig
2
+++ libs/ardour/ardour/io.h
3
@@ -288,6 +288,10 @@ class IO : public PBD::StatefulDestructi
4
 	XMLNode *pending_state_node;
5
 	int ports_became_legal ();
6
 
7
+	static bool connecting_is_legal() {
8
+		return connecting_legal;
9
+	}
10
+
11
   private:
12
 	mutable Glib::Mutex io_lock;
13
 
(-)audio/ardour/files/patch-libs-ardour-session.cc (-368 lines)
Lines 1-368 Link Here
1
--- libs/ardour/session.cc.orig
2
+++ libs/ardour/session.cc
3
@@ -79,7 +79,6 @@
4
 using namespace std;
5
 using namespace ARDOUR;
6
 using namespace PBD;
7
-using boost::shared_ptr;
8
 
9
 #ifdef __x86_64__
10
 static const int CPU_CACHE_ALIGN = 64;
11
@@ -399,14 +398,14 @@ Session::Session (AudioEngine &eng,
12
 		int control_id = 1;
13
 		
14
 		if (control_out_channels) {
15
-			shared_ptr<Route> r (new Route (*this, _("monitor"), -1, control_out_channels, -1, control_out_channels, Route::ControlOut));
16
+			boost::shared_ptr<Route> r (new Route (*this, _("monitor"), -1, control_out_channels, -1, control_out_channels, Route::ControlOut));
17
 			r->set_remote_control_id (control_id++);
18
 			
19
 			rl.push_back (r);
20
 		}
21
 		
22
 		if (master_out_channels) {
23
-			shared_ptr<Route> r (new Route (*this, _("master"), -1, master_out_channels, -1, master_out_channels, Route::MasterOut));
24
+			boost::shared_ptr<Route> r (new Route (*this, _("master"), -1, master_out_channels, -1, master_out_channels, Route::MasterOut));
25
 			r->set_remote_control_id (control_id);
26
 			 
27
 			rl.push_back (r);
28
@@ -984,8 +983,8 @@ Session::hookup_io ()
29
 boost::shared_ptr<Session::RouteList>
30
 Session::get_routes_with_regions_at (nframes64_t const p) const
31
 {
32
-	shared_ptr<RouteList> r = routes.reader ();
33
-	shared_ptr<RouteList> rl (new RouteList);
34
+	boost::shared_ptr<RouteList> r = routes.reader ();
35
+	boost::shared_ptr<RouteList> rl (new RouteList);
36
 
37
 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
38
 		boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
39
@@ -1590,9 +1589,9 @@ struct RouteSorter {
40
 };
41
 
42
 static void
43
-trace_terminal (shared_ptr<Route> r1, shared_ptr<Route> rbase)
44
+trace_terminal (boost::shared_ptr<Route> r1, boost::shared_ptr<Route> rbase)
45
 {
46
-	shared_ptr<Route> r2;
47
+	boost::shared_ptr<Route> r2;
48
 
49
 	if ((r1->fed_by.find (rbase) != r1->fed_by.end()) && (rbase->fed_by.find (r1) != rbase->fed_by.end())) {
50
 		info << string_compose(_("feedback loop setup between %1 and %2"), r1->name(), rbase->name()) << endmsg;
51
@@ -1601,13 +1600,13 @@ trace_terminal (shared_ptr<Route> r1, sh
52
 
53
 	/* make a copy of the existing list of routes that feed r1 */
54
 
55
-	set<shared_ptr<Route> > existing = r1->fed_by;
56
+	set<boost::shared_ptr<Route> > existing = r1->fed_by;
57
 
58
 	/* for each route that feeds r1, recurse, marking it as feeding
59
 	   rbase as well.
60
 	*/
61
 
62
-	for (set<shared_ptr<Route> >::iterator i = existing.begin(); i != existing.end(); ++i) {
63
+	for (set<boost::shared_ptr<Route> >::iterator i = existing.begin(); i != existing.end(); ++i) {
64
 		r2 =* i;
65
 
66
 		/* r2 is a route that feeds r1 which somehow feeds base. mark
67
@@ -1651,14 +1650,14 @@ Session::resort_routes ()
68
 	{
69
 
70
 		RCUWriter<RouteList> writer (routes);
71
-		shared_ptr<RouteList> r = writer.get_copy ();
72
+		boost::shared_ptr<RouteList> r = writer.get_copy ();
73
 		resort_routes_using (r);
74
 		/* writer goes out of scope and forces update */
75
 	}
76
 }
77
 
78
 void
79
-Session::resort_routes_using (shared_ptr<RouteList> r)
80
+Session::resort_routes_using (boost::shared_ptr<RouteList> r)
81
 {
82
 	RouteList::iterator i, j;
83
 	
84
@@ -1723,7 +1722,7 @@ Session::new_audio_track (int input_chan
85
 	/* count existing audio tracks */
86
 
87
 	{
88
-		shared_ptr<RouteList> r = routes.reader ();
89
+		boost::shared_ptr<RouteList> r = routes.reader ();
90
 
91
 		for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
92
 			if (dynamic_cast<AudioTrack*>((*i).get()) != 0) {
93
@@ -1776,7 +1775,7 @@ Session::new_audio_track (int input_chan
94
 			nphysical_out = 0;
95
 		}
96
 
97
-		shared_ptr<AudioTrack> track;
98
+		boost::shared_ptr<AudioTrack> track;
99
 		
100
 		try {
101
 			track = boost::shared_ptr<AudioTrack>((new AudioTrack (*this, track_name, Route::Flag (0), mode)));
102
@@ -1884,7 +1883,7 @@ Session::set_remote_control_ids ()
103
 {
104
 	RemoteModel m = Config->get_remote_model();
105
 
106
-	shared_ptr<RouteList> r = routes.reader ();
107
+	boost::shared_ptr<RouteList> r = routes.reader ();
108
 
109
 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
110
 		if ( MixerOrdered == m) {			
111
@@ -1913,7 +1912,7 @@ Session::new_audio_route (int input_chan
112
 	/* count existing audio busses */
113
 
114
 	{
115
-		shared_ptr<RouteList> r = routes.reader ();
116
+		boost::shared_ptr<RouteList> r = routes.reader ();
117
 
118
 		for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
119
 			if (dynamic_cast<AudioTrack*>((*i).get()) == 0) {
120
@@ -1945,7 +1944,7 @@ Session::new_audio_route (int input_chan
121
 		} while (bus_id < (UINT_MAX-1));
122
 
123
 		try {
124
-			shared_ptr<Route> bus (new Route (*this, bus_name, -1, -1, -1, -1, Route::Flag(0), DataType::AUDIO));
125
+			boost::shared_ptr<Route> bus (new Route (*this, bus_name, -1, -1, -1, -1, Route::Flag(0), DataType::AUDIO));
126
 			
127
 			if (bus->ensure_io (input_channels, output_channels, false, this)) {
128
 				error << string_compose (_("cannot configure %1 in/%2 out configuration for new audio track"),
129
@@ -2060,7 +2059,7 @@ Session::new_route_from_template (uint32
130
 		Track::zero_diskstream_id_in_xml (node_copy);
131
 		
132
 		try {
133
-			shared_ptr<Route> route (XMLRouteFactory (node_copy));
134
+			boost::shared_ptr<Route> route (XMLRouteFactory (node_copy));
135
 	    
136
 			if (route == 0) {
137
 				error << _("Session: cannot create track/bus from template description") << endmsg;
138
@@ -2107,7 +2106,7 @@ boost::shared_ptr<Route>
139
 Session::new_video_track (string name)
140
 {
141
 	uint32_t control_id = ntracks() + nbusses() + 1;
142
-	shared_ptr<Route> new_route (
143
+	boost::shared_ptr<Route> new_route (
144
 		new Route ( *this, name, -1, -1, -1, -1, Route::Flag(0), ARDOUR::DataType::NIL));
145
 	new_route->set_remote_control_id (control_id);
146
 
147
@@ -2115,7 +2114,7 @@ Session::new_video_track (string name)
148
 	rl.push_back (new_route);
149
         {
150
 		RCUWriter<RouteList> writer (routes);
151
-		shared_ptr<RouteList> r = writer.get_copy ();
152
+		boost::shared_ptr<RouteList> r = writer.get_copy ();
153
                 r->insert (r->end(), rl.begin(), rl.end());
154
 		resort_routes_using (r);
155
         }
156
@@ -2127,7 +2126,7 @@ Session::add_routes (RouteList& new_rout
157
 {
158
 	{ 
159
 		RCUWriter<RouteList> writer (routes);
160
-		shared_ptr<RouteList> r = writer.get_copy ();
161
+		boost::shared_ptr<RouteList> r = writer.get_copy ();
162
 		r->insert (r->end(), new_routes.begin(), new_routes.end());
163
 		resort_routes_using (r);
164
 	}
165
@@ -2150,7 +2149,7 @@ Session::add_routes (RouteList& new_rout
166
 		} 
167
 	}
168
 
169
-	if (_control_out && IO::connecting_legal) {
170
+	if (_control_out && IO::connecting_is_legal()) {
171
 
172
 		vector<string> cports;
173
 		uint32_t ni = _control_out->n_inputs();
174
@@ -2198,14 +2197,14 @@ Session::add_diskstream (boost::shared_p
175
 }
176
 
177
 void
178
-Session::remove_route (shared_ptr<Route> route)
179
+Session::remove_route (boost::shared_ptr<Route> route)
180
 {
181
 	//clear solos before removing the route
182
 	route->set_solo ( false, this);
183
 	
184
 	{ 	
185
 		RCUWriter<RouteList> writer (routes);
186
-		shared_ptr<RouteList> rs = writer.get_copy ();
187
+		boost::shared_ptr<RouteList> rs = writer.get_copy ();
188
 		
189
 		rs->remove (route);
190
 
191
@@ -2215,11 +2214,11 @@ Session::remove_route (shared_ptr<Route>
192
 		*/
193
 
194
 		if (route == _master_out) {
195
-			_master_out = shared_ptr<Route> ();
196
+			_master_out = boost::shared_ptr<Route> ();
197
 		}
198
 
199
 		if (route == _control_out) {
200
-			_control_out = shared_ptr<Route> ();
201
+			_control_out = boost::shared_ptr<Route> ();
202
 
203
 			/* cancel control outs for all routes */
204
 
205
@@ -2308,7 +2307,7 @@ Session::route_solo_changed (void* src, 
206
 
207
 	is_track = (boost::dynamic_pointer_cast<AudioTrack>(route) != 0);
208
 	
209
-	shared_ptr<RouteList> r = routes.reader ();
210
+	boost::shared_ptr<RouteList> r = routes.reader ();
211
 
212
 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
213
 		
214
@@ -2404,7 +2403,7 @@ Session::update_route_solo_state ()
215
 	   the solo mute setting of each track.
216
 	*/
217
 	
218
-	shared_ptr<RouteList> r = routes.reader ();
219
+	boost::shared_ptr<RouteList> r = routes.reader ();
220
 
221
         for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
222
 		if ((*i)->soloed()) {
223
@@ -2446,7 +2445,7 @@ Session::update_route_solo_state ()
224
 void
225
 Session::modify_solo_mute (bool is_track, bool mute)
226
 {
227
-	shared_ptr<RouteList> r = routes.reader ();
228
+	boost::shared_ptr<RouteList> r = routes.reader ();
229
 
230
         for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
231
 		
232
@@ -2511,7 +2510,7 @@ Session::catch_up_on_solo_mute_override 
233
 	/* this is called whenever the param solo-mute-override is
234
 	   changed.
235
 	*/
236
-	shared_ptr<RouteList> r = routes.reader ();
237
+	boost::shared_ptr<RouteList> r = routes.reader ();
238
 
239
 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
240
 		(*i)->catch_up_on_solo_mute_override ();
241
@@ -2521,7 +2520,7 @@ Session::catch_up_on_solo_mute_override 
242
 bool
243
 Session::io_name_is_legal (const std::string& name)
244
 {
245
-	shared_ptr<RouteList> r = routes.reader ();
246
+	boost::shared_ptr<RouteList> r = routes.reader ();
247
 
248
 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
249
 		if ((*i)->name() == name) {
250
@@ -2536,10 +2535,10 @@ Session::io_name_is_legal (const std::st
251
 	return true;
252
 }
253
 
254
-shared_ptr<Route>
255
+boost::shared_ptr<Route>
256
 Session::route_by_name (const std::string& name)
257
 {
258
-	shared_ptr<RouteList> r = routes.reader ();
259
+	boost::shared_ptr<RouteList> r = routes.reader ();
260
 
261
 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
262
 		if ((*i)->name() == name) {
263
@@ -2547,13 +2546,13 @@ Session::route_by_name (const std::strin
264
 		}
265
 	}
266
 
267
-	return shared_ptr<Route> ((Route*) 0);
268
+	return boost::shared_ptr<Route> ((Route*) 0);
269
 }
270
 
271
-shared_ptr<Route>
272
+boost::shared_ptr<Route>
273
 Session::route_by_id (PBD::ID id)
274
 {
275
-	shared_ptr<RouteList> r = routes.reader ();
276
+	boost::shared_ptr<RouteList> r = routes.reader ();
277
 
278
 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
279
 		if ((*i)->id() == id) {
280
@@ -2561,13 +2560,13 @@ Session::route_by_id (PBD::ID id)
281
 		}
282
 	}
283
 
284
-	return shared_ptr<Route> ((Route*) 0);
285
+	return boost::shared_ptr<Route> ((Route*) 0);
286
 }
287
 
288
-shared_ptr<Route>
289
+boost::shared_ptr<Route>
290
 Session::route_by_remote_id (uint32_t id)
291
 {
292
-	shared_ptr<RouteList> r = routes.reader ();
293
+	boost::shared_ptr<RouteList> r = routes.reader ();
294
 
295
 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
296
 		if ((*i)->remote_control_id() == id) {
297
@@ -2575,7 +2574,7 @@ Session::route_by_remote_id (uint32_t id
298
 		}
299
 	}
300
 
301
-	return shared_ptr<Route> ((Route*) 0);
302
+	return boost::shared_ptr<Route> ((Route*) 0);
303
 }
304
 
305
 void
306
@@ -3595,7 +3594,7 @@ Session::is_auditioning () const
307
 void
308
 Session::set_all_solo (bool yn)
309
 {
310
-	shared_ptr<RouteList> r = routes.reader ();
311
+	boost::shared_ptr<RouteList> r = routes.reader ();
312
 
313
 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
314
 		if (!(*i)->hidden()) {
315
@@ -3609,7 +3608,7 @@ Session::set_all_solo (bool yn)
316
 void
317
 Session::set_all_mute (bool yn)
318
 {
319
-	shared_ptr<RouteList> r = routes.reader ();
320
+	boost::shared_ptr<RouteList> r = routes.reader ();
321
 	
322
 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
323
 		if (!(*i)->hidden()) {
324
@@ -3680,7 +3679,7 @@ Session::record_enable_all ()
325
 void
326
 Session::record_enable_change_all (bool yn)
327
 {
328
-	shared_ptr<RouteList> r = routes.reader ();
329
+	boost::shared_ptr<RouteList> r = routes.reader ();
330
 	
331
 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
332
 		AudioTrack* at;
333
@@ -4071,7 +4070,7 @@ Session::reset_native_file_format ()
334
 bool
335
 Session::route_name_unique (string n) const
336
 {
337
-	shared_ptr<RouteList> r = routes.reader ();
338
+	boost::shared_ptr<RouteList> r = routes.reader ();
339
 	
340
 	for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
341
 		if ((*i)->name() == n) {
342
@@ -4117,7 +4116,7 @@ Session::allocate_pan_automation_buffers
343
 int
344
 Session::freeze (InterThreadInfo& itt)
345
 {
346
-	shared_ptr<RouteList> r = routes.reader ();
347
+	boost::shared_ptr<RouteList> r = routes.reader ();
348
 
349
 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
350
 
351
@@ -4355,7 +4354,7 @@ uint32_t 
352
 Session::ntracks () const
353
 {
354
 	uint32_t n = 0;
355
-	shared_ptr<RouteList> r = routes.reader ();
356
+	boost::shared_ptr<RouteList> r = routes.reader ();
357
 
358
 	for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
359
 		if (dynamic_cast<AudioTrack*> ((*i).get())) {
360
@@ -4370,7 +4369,7 @@ uint32_t 
361
 Session::nbusses () const
362
 {
363
 	uint32_t n = 0;
364
-	shared_ptr<RouteList> r = routes.reader ();
365
+	boost::shared_ptr<RouteList> r = routes.reader ();
366
 
367
 	for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
368
 		if (dynamic_cast<AudioTrack*> ((*i).get()) == 0) {
(-)audio/ardour/files/patch-libs-fst-jackvst.h (-22 lines)
Lines 1-22 Link Here
1
--- libs/fst/jackvst.h.orig	Wed Aug 30 22:49:25 2006
2
+++ libs/fst/jackvst.h	Sat Mar 24 16:58:18 2007
3
@@ -6,7 +6,9 @@
4
 #include <jack/jack.h>
5
 #include <jack/ringbuffer.h>
6
 #include <fst.h>
7
+#ifdef WITH_ALSA
8
 #include <alsa/asoundlib.h>
9
+#endif
10
 
11
 typedef struct _JackVST JackVST;
12
 
13
@@ -26,7 +28,9 @@
14
     /* For VST/i support */
15
 
16
     pthread_t          midi_thread;
17
+#ifdef WITH_ALSA
18
     snd_seq_t*         seq;
19
+#endif WITH_ALSA
20
     int                midiquit;
21
     jack_ringbuffer_t* event_queue;
22
     struct VstEvents*  events;
(-)audio/ardour/files/patch-libs-fst-vsti.c (-18 lines)
Lines 1-18 Link Here
1
--- libs/fst/vsti.c.orig	Sat Mar 24 16:56:58 2007
2
+++ libs/fst/vsti.c	Sat Mar 24 16:59:07 2007
3
@@ -32,6 +32,8 @@
4
 #include <jackvst.h>
5
 #include <vst/aeffectx.h>
6
 
7
+#ifdef WITH_ALSA
8
+
9
 snd_seq_t *
10
 create_sequencer (const char* client_name, bool isinput)
11
 {
12
@@ -177,5 +179,5 @@
13
 	snd_seq_close (jvst->seq);
14
 }
15
 
16
-
17
+#endif
18
 
(-)audio/ardour/files/patch-libs-midi++2-SConscript (-12 lines)
Lines 1-12 Link Here
1
--- libs/midi++2/SConscript.orig	Sun Nov 12 16:24:06 2006
2
+++ libs/midi++2/SConscript	Wed Dec  6 00:49:53 2006
3
@@ -39,8 +39,7 @@
4
    midi2.Append (LINKFLAGS="-framework CoreMIDI")
5
    midi2.Append (LINKFLAGS="-framework CoreFoundation")
6
 else:
7
-   sysdep_src = [ 'alsa_sequencer_midiport.cc' ]
8
-   midi2.Append (CCFLAGS="-DWITH_ALSA")
9
+   sysdep_src = [ ]
10
 
11
 midi2.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
12
 midi2.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
(-)audio/ardour/files/patch-libs-pbd-mountpoint.cc (-11 lines)
Lines 1-11 Link Here
1
--- libs/pbd/mountpoint.cc.orig
2
+++ libs/pbd/mountpoint.cc
3
@@ -19,7 +19,7 @@
4
 */
5
 
6
 #include <cstdio>
7
-#include <cstring>
8
+#include <cstdlib>
9
 #include <string>
10
 #include <cstring>
11
 #include <limits.h>
(-)audio/ardour/files/patch-libs-pbd-pbd-stl_delete.h (-20 lines)
Lines 1-20 Link Here
1
--- libs/pbd/pbd/stl_delete.h.orig
2
+++ libs/pbd/pbd/stl_delete.h
3
@@ -23,7 +23,7 @@
4
 /* To actually use any of these deletion functions, you need to
5
    first include the revelant container type header.
6
 */
7
-#if defined(_CPP_VECTOR) || defined(_GLIBCXX_VECTOR) || defined(__SGI_STL_VECTOR)
8
+#if defined(_LIBCPP_VECTOR) || defined(_GLIBCXX_VECTOR) || defined(__SGI_STL_VECTOR)
9
 template<class T> void vector_delete (std::vector<T *> *vec) 
10
 {
11
 	typename std::vector<T *>::iterator i;
12
@@ -33,7 +33,7 @@ template<class T> void vector_delete (st
13
 	}
14
 	vec->clear ();
15
 }
16
-#endif // _CPP_VECTOR || _GLIBCXX_VECTOR || __SGI_STL_VECTOR
17
+#endif // _LIBCPP_VECTOR || _GLIBCXX_VECTOR || __SGI_STL_VECTOR
18
 
19
 #if defined(_CPP_MAP) || defined(_GLIBCXX_MAP) || defined(__SGI_STL_MAP)
20
 template<class K, class T> void map_delete (std::map<K, T *> *m) 
(-)audio/ardour/files/patch-libs-pbd-stacktrace.cc (-13 lines)
Lines 1-13 Link Here
1
--- libs/pbd/stacktrace.cc.orig	Thu Mar 29 18:26:37 2007
2
+++ libs/pbd/stacktrace.cc	Thu Mar 29 18:27:27 2007
3
@@ -3,7 +3,9 @@
4
 
5
 /* Obtain a backtrace and print it to stdout. */
6
 
7
-#ifdef HAVE_EXECINFO
8
+/* Without this change, ardourvst dies during startup with
9
+   'wine: could not load L"Z:\\usr\\local\\lib\\ardour2\\ardour_vst.exe.so": Bad EXE format for''. */
10
+#if 0
11
 
12
 #include <execinfo.h>
13
 #include <stdlib.h>
(-)audio/ardour/files/patch-libs-surfaces-mackie-mackie_control_protocol.cc (-29 lines)
Lines 1-29 Link Here
1
--- libs/surfaces/mackie/mackie_control_protocol.cc.orig
2
+++ libs/surfaces/mackie/mackie_control_protocol.cc
3
@@ -64,8 +64,6 @@ using namespace sigc;
4
 using namespace Mackie;
5
 using namespace PBD;
6
 
7
-using boost::shared_ptr;
8
-
9
 #include "i18n.h"
10
 
11
 MackieMidiBuilder builder;
12
@@ -200,7 +198,7 @@ MackieControlProtocol::port_for_id( uint
13
 // predicate for sort call in get_sorted_routes
14
 struct RouteByRemoteId
15
 {
16
-	bool operator () ( const shared_ptr<Route> & a, const shared_ptr<Route> & b ) const {
17
+	bool operator () ( const boost::shared_ptr<Route> & a, const boost::shared_ptr<Route> & b ) const {
18
 		return a->remote_control_id() < b->remote_control_id();
19
 	}
20
 
21
@@ -680,7 +678,7 @@ MackieControlProtocol::create_ports()
22
 	}
23
 }
24
 
25
-shared_ptr<Route>
26
+boost::shared_ptr<Route>
27
 MackieControlProtocol::master_route()
28
 {
29
 	boost::shared_ptr<IO> mo = session->master_out ();
(-)audio/ardour/files/patch-tempoline_crash (-83 lines)
Lines 1-83 Link Here
1
commit b29f54fb6efcdb2facf0471bd8e24d8eea3231b0
2
Author: Paul Davis <paul@linuxaudiosystems.com>
3
Date:   Wed Feb 20 18:53:30 2013 +0000
4
5
    back-port tempo line assert fix from 3.0 to stop crashing under some relatively easy to hit conditions
6
    
7
    git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@14067 d708f5d6-7413-0410-9779-e7cbd77b26cf
8
9
diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc
10
index e8bd034..a373dec 100644
11
--- gtk2_ardour/tempo_lines.cc.orig
12
+++ gtk2_ardour/tempo_lines.cc
13
@@ -146,9 +146,8 @@ TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit
14
 			}
15
 
16
 			xpos = rint(((nframes64_t)(*i).frame) / (double)frames_per_unit);
17
-			if (inserted_last_time && !_lines.empty()) {
18
-				li = _lines.lower_bound(xpos); // first line >= xpos
19
-			}
20
+
21
+                        li = _lines.lower_bound(xpos); // first line >= xpos
22
                              
23
 			line = (li != _lines.end()) ? li->second : NULL;
24
 			assert(!line || line->property_x1() == li->first);
25
@@ -215,33 +214,35 @@ TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit
26
 				// Create a new line
27
 			} else if (_lines.size() < needed || _lines.size() < MAX_CACHED_LINES) {
28
 				//cout << "*** CREATING LINE" << endl;
29
-				assert(_lines.find(xpos) == _lines.end());
30
-				line = new ArdourCanvas::SimpleLine (*_group);
31
-				line->property_x1() = xpos;
32
-				line->property_x2() = xpos;
33
-				line->property_y1() = 0.0;
34
-				line->property_y2() = _height;
35
-				line->property_color_rgba() = color;
36
-				_lines.insert(make_pair(xpos, line));
37
-				inserted_last_time = true;
38
+				if (_lines.find(xpos) == _lines.end()) {
39
+                                        line = new ArdourCanvas::SimpleLine (*_group);
40
+                                        line->property_x1() = xpos;
41
+                                        line->property_x2() = xpos;
42
+                                        line->property_y1() = 0.0;
43
+                                        line->property_y2() = _height;
44
+                                        line->property_color_rgba() = color;
45
+                                        _lines.insert(make_pair(xpos, line));
46
+                                        inserted_last_time = true;
47
+                                }
48
 
49
 				// Steal from the left
50
 			} else {
51
 				//cout << "*** STEALING FROM LEFT" << endl;
52
-				assert(_lines.find(xpos) == _lines.end());
53
-				Lines::iterator steal = _lines.begin();
54
-				line = steal->second;
55
-				_lines.erase(steal);
56
-				line->property_color_rgba() = color;
57
-				line->property_x1() = xpos;
58
-				line->property_x2() = xpos;
59
-				_lines.insert(make_pair(xpos, line));
60
-				inserted_last_time = true; // search next time
61
-				invalidated = true;
62
-                               
63
-				// Shift clean range right
64
-				_clean_left = max(_clean_left, steal->first);
65
-				_clean_right = max(_clean_right, xpos);
66
+				if (_lines.find(xpos) == _lines.end()) {
67
+                                        Lines::iterator steal = _lines.begin();
68
+                                        line = steal->second;
69
+                                        _lines.erase(steal);
70
+                                        line->property_color_rgba() = color;
71
+                                        line->property_x1() = xpos;
72
+                                        line->property_x2() = xpos;
73
+                                        _lines.insert(make_pair(xpos, line));
74
+                                        inserted_last_time = true; // search next time
75
+                                        invalidated = true;
76
+                                        
77
+                                        // Shift clean range right
78
+                                        _clean_left = max(_clean_left, steal->first);
79
+                                        _clean_right = max(_clean_right, xpos);
80
+                                }
81
 			}
82
 
83
 			break;
(-)audio/ardour/files/patch-vst-SConscript (-11 lines)
Lines 1-11 Link Here
1
--- vst/SConscript.orig	Sat Mar 24 13:25:52 2007
2
+++ vst/SConscript	Sat Mar 24 13:26:42 2007
3
@@ -20,7 +20,7 @@
4
 )
5
 
6
 ardour_vst.Append (CCFLAGS="-DVST_SUPPORT", CPPPATH="#libs/fst", LIBPATH='#gtk2_ardour', LIBS="ardourgtk")
7
-ardour_vst.Append (LINKFLAGS='-L/usr/X11R6/lib -lasound -lX11 -lpthread') 
8
+#ardour_vst.Append (LINKFLAGS='-L/usr/X11R6/lib -lasound -lX11 -lpthread') 
9
 ardour_vst["CC"] ="winegcc"
10
 ardour_vst["LINK"] ="wineg++ -mwindows"
11
 
(-)audio/ardour/pkg-descr (-14 lines)
Lines 1-14 Link Here
1
Ardour is a digital audio workstation.  You can use it to record, edit, and
2
mix multi-track audio.  Produce your own CD's.  Mix video soundtracks.
3
Experiment with new ideas about music and sound.  Generate sound
4
installations for 12 speaker gallery shows.
5
6
Ardour capabilities include: multichannel recording, non-linear, non-
7
destructive region based editing with unlimited undo/redo, full automation
8
support, a mixer whose capabilities rival high end hardware consoles, lots
9
of plugins to warp, shift, and shape your music, and controllable from
10
hardware control surfaces at the same time as it syncs to timecode.  If you
11
have been looking for a tool similar to ProTools, Nuendo, Cubase SX, Digital
12
Performer, Samplitude, or Sequoia, you might have found it.
13
14
WWW: http://ardour.org/
(-)audio/ardour/pkg-plist (-157 lines)
Lines 1-157 Link Here
1
%%NO_VST%%bin/ardour2
2
%%VST%%bin/ardourvst
3
etc/ardour2/SAE-de-keypad.bindings
4
etc/ardour2/SAE-de-nokeypad.bindings
5
etc/ardour2/SAE-us-keypad.bindings
6
etc/ardour2/SAE-us-nokeypad.bindings
7
etc/ardour2/ardour-sae.menus
8
etc/ardour2/ardour.menus
9
etc/ardour2/ardour2_ui_dark.rc
10
etc/ardour2/ardour2_ui_dark_sae.rc
11
etc/ardour2/ardour2_ui_default.conf
12
etc/ardour2/ardour2_ui_light.rc
13
etc/ardour2/ardour2_ui_light_sae.rc
14
etc/ardour2/ardour_system.rc
15
etc/ardour2/ergonomic-us.bindings
16
etc/ardour2/mnemonic-us.bindings
17
%%NO_VST%%lib/ardour2/ardour-%%DISTVERSION%%
18
%%VST%%lib/ardour2/ardour_vst.exe.so
19
lib/ardour2/engines/libclearlooks.so
20
lib/ardour2/libardour.so
21
lib/ardour2/libardour_cp.so
22
%%VST%%lib/ardour2/libardourgtk.so
23
lib/ardour2/libgtkmm2ext.so
24
lib/ardour2/libmidi++.so
25
lib/ardour2/libpbd.so
26
lib/ardour2/librubberband.so
27
lib/ardour2/libvamphostsdk.so
28
lib/ardour2/libvampsdk.so
29
lib/ardour2/surfaces/libardour_genericmidi.so
30
lib/ardour2/surfaces/libardour_mackie.so
31
lib/ardour2/surfaces/libardour_tranzport.so
32
lib/ardour2/vamp/libardourvampplugins.so
33
share/ardour2/icons/application-x-ardour_16px.png
34
share/ardour2/icons/application-x-ardour_22px.png
35
share/ardour2/icons/application-x-ardour_32px.png
36
share/ardour2/icons/application-x-ardour_48px.png
37
share/ardour2/icons/ardour_icon_16px.png
38
share/ardour2/icons/ardour_icon_22px.png
39
share/ardour2/icons/ardour_icon_32px.png
40
share/ardour2/icons/ardour_icon_48px.png
41
share/ardour2/icons/computer_keyboard.png
42
share/ardour2/icons/computer_keyboard_active.png
43
share/ardour2/icons/crossfade-in-S1.png
44
share/ardour2/icons/crossfade-in-S2.png
45
share/ardour2/icons/crossfade-in-constant-power.png
46
share/ardour2/icons/crossfade-in-fast-cut.png
47
share/ardour2/icons/crossfade-in-linear.png
48
share/ardour2/icons/crossfade-in-long-cut.png
49
share/ardour2/icons/crossfade-in-short-cut.png
50
share/ardour2/icons/crossfade-in-slow-cut.png
51
share/ardour2/icons/crossfade-out-S1.png
52
share/ardour2/icons/crossfade-out-S2.png
53
share/ardour2/icons/crossfade-out-constant-power.png
54
share/ardour2/icons/crossfade-out-fast-cut.png
55
share/ardour2/icons/crossfade-out-linear.png
56
share/ardour2/icons/crossfade-out-long-cut.png
57
share/ardour2/icons/crossfade-out-short-cut.png
58
share/ardour2/icons/crossfade-out-slow-cut.png
59
share/ardour2/icons/fader_belt.png
60
share/ardour2/icons/fader_belt_h.png
61
share/ardour2/icons/ferret_02.png
62
share/ardour2/icons/grabber_edit_point.png
63
share/ardour2/icons/hide.png
64
share/ardour2/icons/nudge_left.png
65
share/ardour2/icons/nudge_right.png
66
share/ardour2/icons/record_normal_red.png
67
share/ardour2/icons/record_tape_red.png
68
share/ardour2/icons/sae.png
69
share/ardour2/icons/saelogo.png
70
share/ardour2/icons/strip_width.png
71
share/ardour2/icons/tool_audition.png
72
share/ardour2/icons/tool_gain.png
73
share/ardour2/icons/tool_object.png
74
share/ardour2/icons/tool_stretch.png
75
share/ardour2/icons/tool_zoom.png
76
share/ardour2/icons/transport_end.png
77
share/ardour2/icons/transport_loop.png
78
share/ardour2/icons/transport_play.png
79
share/ardour2/icons/transport_range.png
80
share/ardour2/icons/transport_record.png
81
share/ardour2/icons/transport_start.png
82
share/ardour2/icons/transport_stop.png
83
share/ardour2/icons/zoom_full.png
84
share/ardour2/icons/zoom_in.png
85
share/ardour2/icons/zoom_out.png
86
share/ardour2/pixmaps/forwardblarrow.xpm
87
share/ardour2/pixmaps/hiin.xpm
88
share/ardour2/pixmaps/hiout.xpm
89
share/ardour2/pixmaps/hslider00.xpm
90
share/ardour2/pixmaps/hslider01.xpm
91
share/ardour2/pixmaps/left_arrow.xpm
92
share/ardour2/pixmaps/linin.xpm
93
share/ardour2/pixmaps/linout.xpm
94
share/ardour2/pixmaps/loin.xpm
95
share/ardour2/pixmaps/loop.xpm
96
share/ardour2/pixmaps/loout.xpm
97
share/ardour2/pixmaps/lr.xpm
98
share/ardour2/pixmaps/regin.xpm
99
share/ardour2/pixmaps/regin2.xpm
100
share/ardour2/pixmaps/regout.xpm
101
share/ardour2/pixmaps/regout2.xpm
102
share/ardour2/pixmaps/revdblarrow.xpm
103
share/ardour2/pixmaps/right_arrow.xpm
104
share/ardour2/pixmaps/set-next-button.xpm
105
share/ardour2/pixmaps/small-round-button-01.xpm
106
share/ardour2/pixmaps/small_x.xpm
107
share/ardour2/pixmaps/toggle-button-00.xpm
108
share/ardour2/pixmaps/toggle-button-01.xpm
109
share/ardour2/pixmaps/tool_audition.xpm
110
share/ardour2/pixmaps/tool_gain.xpm
111
share/ardour2/pixmaps/tool_object.xpm
112
share/ardour2/pixmaps/tool_range.xpm
113
share/ardour2/pixmaps/tool_stretch.xpm
114
share/ardour2/pixmaps/tool_zoom.xpm
115
share/ardour2/pixmaps/vslider00.xpm
116
share/ardour2/pixmaps/vslider01.xpm
117
share/ardour2/pixmaps/vslider02_rail.xpm
118
share/ardour2/pixmaps/vslider02_slider.xpm
119
share/ardour2/pixmaps/vslider_slider_16wide.xpm
120
share/ardour2/pixmaps/zoom_full.xpm
121
share/ardour2/pixmaps/zoom_in.xpm
122
share/ardour2/pixmaps/zoom_out.xpm
123
share/ardour2/splash.png
124
share/ardour2/templates/16 Tracks.template
125
share/ardour2/templates/2 Track.template
126
share/ardour2/templates/32 Tracks.template
127
share/ardour2/templates/4 Tracks.template
128
share/ardour2/templates/8 Tracks.template
129
share/locale/cs/LC_MESSAGES/gtk2_ardour.mo
130
share/locale/de/LC_MESSAGES/gtk2_ardour.mo
131
share/locale/el/LC_MESSAGES/gtk2_ardour.mo
132
share/locale/el/LC_MESSAGES/libardour2.mo
133
share/locale/el/LC_MESSAGES/libgtkmm2ext.mo
134
share/locale/es/LC_MESSAGES/gtk2_ardour.mo
135
share/locale/es/LC_MESSAGES/libardour2.mo
136
share/locale/es/LC_MESSAGES/libgtkmm2ext.mo
137
share/locale/eu/LC_MESSAGES/gtk2_ardour.mo
138
share/locale/eu/LC_MESSAGES/libardour2.mo
139
share/locale/eu/LC_MESSAGES/libgtkmm2ext.mo
140
share/locale/fr/LC_MESSAGES/gtk2_ardour.mo
141
share/locale/fr/LC_MESSAGES/libardour2.mo
142
share/locale/it/LC_MESSAGES/gtk2_ardour.mo
143
share/locale/it/LC_MESSAGES/libardour2.mo
144
share/locale/nn/LC_MESSAGES/gtk2_ardour.mo
145
share/locale/nn/LC_MESSAGES/libardour2.mo
146
share/locale/nn/LC_MESSAGES/libgtkmm2ext.mo
147
share/locale/pl/LC_MESSAGES/gtk2_ardour.mo
148
share/locale/pl/LC_MESSAGES/libardour2.mo
149
share/locale/pl/LC_MESSAGES/libgtkmm2ext.mo
150
share/locale/pt/LC_MESSAGES/gtk2_ardour.mo
151
share/locale/pt/LC_MESSAGES/libgtkmm2ext.mo
152
share/locale/pt_PT/LC_MESSAGES/gtk2_ardour.mo
153
share/locale/ru/LC_MESSAGES/gtk2_ardour.mo
154
share/locale/ru/LC_MESSAGES/libardour2.mo
155
share/locale/ru/LC_MESSAGES/libgtkmm2ext.mo
156
share/locale/sv/LC_MESSAGES/gtk2_ardour.mo
157
share/locale/sv/LC_MESSAGES/libardour2.mo
(-)audio/ardour2/Makefile (-2 / +3 lines)
Lines 1-11 Link Here
1
# Created by: Edward Tomasz Napierala <trasz@pin.if.uz.zgora.pl>
1
# Created by: Edward Tomasz Napierala <trasz@pin.if.uz.zgora.pl>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	ardour
4
PORTNAME=	ardour2
5
PORTVERSION=	2.8.16
5
PORTVERSION=	2.8.16
6
PORTREVISION=	6
6
PORTREVISION=	7
7
CATEGORIES=	audio
7
CATEGORIES=	audio
8
MASTER_SITES=	http://freebsd.nsu.ru/distfiles/
8
MASTER_SITES=	http://freebsd.nsu.ru/distfiles/
9
DISTNAME=	ardour-${PORTVERSION}
9
10
10
MAINTAINER=	danfe@FreeBSD.org
11
MAINTAINER=	danfe@FreeBSD.org
11
COMMENT=	Multichannel digital audio workstation
12
COMMENT=	Multichannel digital audio workstation

Return to bug 222238