Index: Makefile =================================================================== RCS file: /home/pcvs/ports/audio/ardour/Makefile,v retrieving revision 1.46 diff -u -p -r1.46 Makefile --- Makefile 17 Oct 2011 10:08:23 -0000 1.46 +++ Makefile 7 Nov 2011 19:39:46 -0000 @@ -6,19 +6,18 @@ # PORTNAME= ardour -PORTVERSION= 2.8.2 -PORTREVISION= 5 +PORTVERSION= 3.0a10r10465 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://freebsd.nsu.ru/distfiles/ \ #http://releases.ardour.org/ -MASTER_SITE_SUBDIR= trasz +MASTER_SITE_SUBDIR= nox +DISTNAME= ${PORTNAME}-3.0alpha10_10465 MAINTAINER= danfe@FreeBSD.org COMMENT= A multichannel digital audio workstation LIB_DEPENDS= lrdf.2:${PORTSDIR}/textproc/liblrdf \ - raptor.3:${PORTSDIR}/textproc/raptor \ samplerate.1:${PORTSDIR}/audio/libsamplerate \ jack.0:${PORTSDIR}/audio/jack \ sndfile.1:${PORTSDIR}/audio/libsndfile \ @@ -26,26 +25,44 @@ LIB_DEPENDS= lrdf.2:${PORTSDIR}/textproc gnomecanvasmm-2.6:${PORTSDIR}/graphics/libgnomecanvasmm26 \ sqlite3:${PORTSDIR}/databases/sqlite3 \ lo.7:${PORTSDIR}/audio/liblo \ - SoundTouch.0:${PORTSDIR}/audio/soundtouch \ fftw3f:${PORTSDIR}/math/fftw3-float \ fftw3:${PORTSDIR}/math/fftw3 \ - aubio.3:${PORTSDIR}/audio/aubio -BUILD_DEPENDS= jackit>=0.109.2:${PORTSDIR}/audio/jack + aubio.3:${PORTSDIR}/audio/aubio \ + lilv-0.0:${PORTSDIR}/audio/lilv-0 \ + curl:${PORTSDIR}/ftp/curl \ + yajl.1:${PORTSDIR}/devel/yajl \ + execinfo.1:${PORTSDIR}/devel/libexecinfo +BUILD_DEPENDS= lv2config:${PORTSDIR}/audio/lv2core \ + jackit>=0.118.2:${PORTSDIR}/audio/jack # Between 0.109.0 and earlier versions there was an api change in JACK. # However, the library version number was not changed. The line above # is supposed to work around that. -USE_SCONS= yes -SCONS_ENV+= SYSLIBS=yes PREFIX=${PREFIX} NLS=yes -CFLAGS+= -I${LOCALBASE}/include -USE_BZIP2= yes -USE_GNOME= gtk20 libxslt libgnomecanvas intltool +USE_PYTHON= yes +CONFIGURE_ARGS+= --prefix=${PREFIX} \ + --also-include="${LOCALBASE}/include" \ + --dist-target=${DIST_TARGET} +LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo +USE_XZ= yes +USE_GNOME= gtk20 libxslt libgnomecanvas intltool pkgconfig USE_GETTEXT= yes -USE_LDCONFIG= ${PREFIX}/lib/ardour2 ${PREFIX}/lib/ardour2/surfaces -TEMPLATESDIR= ${PREFIX}/share/ardour2/templates +USE_LDCONFIG= ${PREFIX}/lib/ardour3 \ + ${PREFIX}/lib/ardour3/panners \ + ${PREFIX}/lib/ardour3/surfaces \ + ${PREFIX}/lib/ardour3/vamp +MAKE_JOBS_SAFE= yes PLIST_SUB= DISTVERSION=${DISTVERSION} -OPTIONS= OPTIMIZED_CFLAGS "Builds with compiler optimizations" on \ +CFLAGS+= -I${LOCALBASE}/include +CXXFLAGS+= -I${LOCALBASE}/include +# FIXME: C{,XX}FLAGS are currently ignored (because of the change to waf) +#CONFIGURE_ENV+= CC=${CC} CXX=${CXX} CFLAGS="${CFLAGS}" CCFLAGS="${CFLAGS}" \ +# CXXFLAGS="${CXXFLAGS}" \ +# LDFLAGS="${LDFLAGS}" LINKFLAGS="${LDFLAGS}" +CONFIGURE_ENV+= CC=${CC} CXX=${CXX} \ + LDFLAGS="${LDFLAGS}" LINKFLAGS="${LDFLAGS}" +OPTIONS= DEBUG "Builds with debug symbols" on \ + OPTIMIZED_CFLAGS "Builds with compiler optimizations" off \ VST "Enable VST plugins support" off .include @@ -59,7 +76,7 @@ LIB_DEPENDS+= usb:${PORTSDIR}/devel/libu .endif .if defined(WITH_VST) -SCONS_ENV+= VST=yes +CONFIGURE_ARGS+= --vst BUILD_DEPENDS+= winegcc:${PORTSDIR}/emulators/wine \ unzip:${PORTSDIR}/archivers/unzip \ gsed:${PORTSDIR}/textproc/gsed @@ -81,34 +98,46 @@ BROKEN= Does not install CFLAGS+= -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce .if ${ARCH} == "amd64" -SCONS_ENV+= DIST_TARGET=x86_64 -SCONS_ENV+= FPU_OPTIMIZATION=1 +DIST_TARGET= x86_64 +CONFIGURE_ARGS+= --fpu-optimization --optimize .elif ${MACHINE_CPU:Msse} -SCONS_ENV+= DIST_TARGET=i686 -SCONS_ENV+= FPU_OPTIMIZATION=1 +DIST_TARGET= i686 +CONFIGURE_ARGS+= --fpu-optimization --optimize .else -SCONS_ENV+= DIST_TARGET=i386 -SCONS_ENV+= FPU_OPTIMIZATION=0 +DIST_TARGET= ${ARCH} +CONFIGURE_ARGS+= --no-fpu-optimization .endif .else -SCONS_ENV+= FPU_OPTIMIZATION=0 +CONFIGURE_ARGS+= --no-fpu-optimization + +.if ${ARCH} == "amd64" +DIST_TARGET= x86_64 +.else +DIST_TARGET= ${ARCH} +.endif + +.endif + +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --debug .endif CFLAGS:= ${CFLAGS:N-fno-strict-aliasing} post-patch: - ${REINPLACE_CMD} -e "s|%%CFLAGS%%|${CFLAGS}|g" ${WRKSRC}/SConstruct - ${REINPLACE_CMD} -e "s|alsa_pcm|oss|g" ${WRKSRC}/templates/*.template + ${CP} ${FILESDIR}/svn_revision.cc ${WRKSRC}/libs/ardour + +do-configure: + (cd ${WRKSRC} && ${CONFIGURE_ENV} ${PYTHON_CMD} ./waf configure ${CONFIGURE_ARGS}) + +do-build: + (cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} ./waf build -j ${MAKE_JOBS_NUMBER}) + +post-build: + (cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} ./waf i18n) -post-install: - ${CHOWN} -R 0:0 ${PREFIX}/lib/ardour2/ - ${CHMOD} -R a+rX ${PREFIX}/lib/ardour2/ - ${CHOWN} -R 0:0 ${PREFIX}/etc/ardour2/ - ${CHMOD} -R a+rX ${PREFIX}/etc/ardour2/ - ${CHOWN} -R 0:0 ${PREFIX}/share/ardour2/ - ${CHMOD} -R a+rX ${PREFIX}/share/ardour2/ - ${MKDIR} ${TEMPLATESDIR} - ${INSTALL_DATA} ${WRKSRC}/templates/*.template ${TEMPLATESDIR}/ +do-install: + (cd ${WRKSRC} && ${PYTHON_CMD} ./waf install) .include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/audio/ardour/distinfo,v retrieving revision 1.21 diff -u -p -r1.21 distinfo --- distinfo 19 Mar 2011 12:27:47 -0000 1.21 +++ distinfo 5 Nov 2011 23:39:12 -0000 @@ -1,2 +1,2 @@ -SHA256 (ardour-2.8.2.tar.bz2) = 659c4a50a2d045bdfd9b93ab7966726438a555f14d6122986acbd36c72d8fcc5 -SIZE (ardour-2.8.2.tar.bz2) = 3430971 +SHA256 (ardour-3.0alpha10_10465.tar.xz) = 9e8d348ffd3a1f6b414f7a3aa183cf3d0f01d434d9ec5cec55dd444d7563a990 +SIZE (ardour-3.0alpha10_10465.tar.xz) = 5911612 Index: pkg-descr =================================================================== RCS file: /home/pcvs/ports/audio/ardour/pkg-descr,v retrieving revision 1.2 diff -u -p -r1.2 pkg-descr --- pkg-descr 18 Sep 2009 19:13:07 -0000 1.2 +++ pkg-descr 2 Sep 2011 10:46:47 -0000 @@ -1,3 +1,12 @@ +This is an alpha version of Ardour 3.0. + +You are respectfully requested NOT to ask for assistance with build issues +and not to report issues with Ardour 3.0 on the forums at ardour.org. + +Please use IRC, the bug tracker and/or the ardour mailing lists (-dev or -user) + +Thanks for your co-operation with our development process. + 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 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/audio/ardour/pkg-plist,v retrieving revision 1.19 diff -u -p -r1.19 pkg-plist --- pkg-plist 1 Oct 2009 03:24:56 -0000 1.19 +++ pkg-plist 6 Nov 2011 00:16:17 -0000 @@ -1,179 +1,334 @@ -%%NO_VST%%bin/ardour2 +%%NO_VST%%bin/ardour3 %%VST%%bin/ardourvst -lib/ardour2/libsndfile-ardour.so -lib/ardour2/libpbd.so -lib/ardour2/libmidi++.so -lib/ardour2/libardour.so -%%NO_VST%%lib/ardour2/ardour-%%DISTVERSION%% -%%VST%%lib/ardour2/ardour_vst.exe.so -%%VST%%lib/ardour2/libardourgtk.so -lib/ardour2/libgtkmm2ext.so -lib/ardour2/libardour_cp.so -lib/ardour2/libvampsdk.so -lib/ardour2/libvamphostsdk.so -lib/ardour2/libsoundtouch.so -lib/ardour2/librubberband.so -lib/ardour2/surfaces/libardour_genericmidi.so -lib/ardour2/surfaces/libardour_mackie.so -lib/ardour2/surfaces/libardour_tranzport.so -@dirrm lib/ardour2/surfaces -lib/ardour2/engines/libclearlooks.so -@dirrm lib/ardour2/engines -lib/ardour2/vamp/libardourvampplugins.so -@dirrm lib/ardour2/vamp -@dirrm lib/ardour2 -etc/ardour2/ardour.menus -etc/ardour2/ardour_system.rc -etc/ardour2/ardour2_ui_dark.rc -etc/ardour2/ardour2_ui_light.rc -etc/ardour2/ardour2_ui_default.conf -etc/ardour2/ardour-sae.menus -etc/ardour2/ergonomic-us.bindings -etc/ardour2/mnemonic-us.bindings -etc/ardour2/ardour2_ui_dark_sae.rc -etc/ardour2/ardour2_ui_light_sae.rc -etc/ardour2/SAE-de-keypad.bindings -etc/ardour2/SAE-us-keypad.bindings -etc/ardour2/SAE-de-nokeypad.bindings -etc/ardour2/SAE-us-nokeypad.bindings -@dirrmtry etc/ardour2 -share/ardour2/splash.png -share/ardour2/pixmaps/hslider00.xpm -share/ardour2/pixmaps/vslider01.xpm -share/ardour2/pixmaps/tool_audition.xpm -share/ardour2/pixmaps/vslider02_slider.xpm -share/ardour2/pixmaps/right_arrow.xpm -share/ardour2/pixmaps/vslider_slider_16wide.xpm -share/ardour2/pixmaps/lr.xpm -share/ardour2/pixmaps/hiout.xpm -share/ardour2/pixmaps/hiin.xpm -share/ardour2/pixmaps/tool_range.xpm -share/ardour2/pixmaps/zoom_full.xpm -share/ardour2/pixmaps/regin.xpm -share/ardour2/pixmaps/revdblarrow.xpm -share/ardour2/pixmaps/tool_gain.xpm -share/ardour2/pixmaps/left_arrow.xpm -share/ardour2/pixmaps/toggle-button-00.xpm -share/ardour2/pixmaps/tool_stretch.xpm -share/ardour2/pixmaps/forwardblarrow.xpm -share/ardour2/pixmaps/vslider02_rail.xpm -share/ardour2/pixmaps/loin.xpm -share/ardour2/pixmaps/linout.xpm -share/ardour2/pixmaps/small_x.xpm -share/ardour2/pixmaps/toggle-button-01.xpm -share/ardour2/pixmaps/regin2.xpm -share/ardour2/pixmaps/tool_zoom.xpm -share/ardour2/pixmaps/regout.xpm -share/ardour2/pixmaps/linin.xpm -share/ardour2/pixmaps/regout2.xpm -share/ardour2/pixmaps/zoom_out.xpm -share/ardour2/pixmaps/loout.xpm -share/ardour2/pixmaps/tool_object.xpm -share/ardour2/pixmaps/set-next-button.xpm -share/ardour2/pixmaps/loop.xpm -share/ardour2/pixmaps/small-round-button-01.xpm -share/ardour2/pixmaps/hslider01.xpm -share/ardour2/pixmaps/vslider00.xpm -share/ardour2/pixmaps/zoom_in.xpm -@dirrm share/ardour2/pixmaps -share/ardour2/icons/tool_stretch.png -share/ardour2/icons/zoom_full.png -share/ardour2/icons/tool_object.png -share/ardour2/icons/transport_play.png -share/ardour2/icons/fader_belt.png -share/ardour2/icons/record_normal_red.png -share/ardour2/icons/transport_loop.png -share/ardour2/icons/tool_audition.png -share/ardour2/icons/transport_end.png -share/ardour2/icons/record_tape_red.png -share/ardour2/icons/hide.png -share/ardour2/icons/tool_zoom.png -share/ardour2/icons/transport_range.png -share/ardour2/icons/zoom_out.png -share/ardour2/icons/zoom_in.png -share/ardour2/icons/tool_gain.png -share/ardour2/icons/strip_width.png -share/ardour2/icons/transport_start.png -share/ardour2/icons/transport_stop.png -share/ardour2/icons/nudge_left.png -share/ardour2/icons/transport_record.png -share/ardour2/icons/nudge_right.png -share/ardour2/icons/ardour_icon_22px.png -share/ardour2/icons/ardour_icon_48px.png -share/ardour2/icons/ardour_icon_32px.png -share/ardour2/icons/ardour_icon_16px.png -share/ardour2/icons/saelogo.png -share/ardour2/icons/sae.png -share/ardour2/icons/ferret_02.png -share/ardour2/icons/grabber_edit_point.png -share/ardour2/icons/application-x-ardour_22px.png -share/ardour2/icons/fader_belt_h.png -share/ardour2/icons/application-x-ardour_32px.png -share/ardour2/icons/application-x-ardour_48px.png -share/ardour2/icons/application-x-ardour_16px.png -share/ardour2/icons/computer_keyboard.png -share/ardour2/icons/computer_keyboard_active.png -share/ardour2/icons/crossfade-out-linear.png -share/ardour2/icons/crossfade-out-long-cut.png -share/ardour2/icons/crossfade-in-S2.png -share/ardour2/icons/crossfade-out-short-cut.png -share/ardour2/icons/crossfade-in-long-cut.png -share/ardour2/icons/crossfade-out-slow-cut.png -share/ardour2/icons/crossfade-in-fast-cut.png -share/ardour2/icons/crossfade-in-linear.png -share/ardour2/icons/crossfade-in-short-cut.png -share/ardour2/icons/crossfade-out-S1.png -share/ardour2/icons/crossfade-in-S1.png -share/ardour2/icons/crossfade-out-constant-power.png -share/ardour2/icons/crossfade-in-constant-power.png -share/ardour2/icons/crossfade-in-slow-cut.png -share/ardour2/icons/crossfade-out-S2.png -share/ardour2/icons/crossfade-out-fast-cut.png -@dirrm share/ardour2/icons -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 -@dirrm share/ardour2/templates -@dirrm share/ardour2 +etc/ardour3/ardour.menus +etc/ardour3/ardour3_ui_default.conf +etc/ardour3/ardour3_widgets.rc +etc/ardour3/export/CD.format +@dirrmtry etc/ardour3/export +etc/ardour3/ardour3_ui_dark.rc +etc/ardour3/ardour3_ui_light.rc +etc/ardour3/ardour_system.rc +etc/ardour3/mixer.bindings +etc/ardour3/mnemonic-us.bindings +etc/ardour3/step_editing.bindings +@dirrmtry etc/ardour3 +%%NO_VST%%lib/ardour3/ardour-3.0 +%%VST%%lib/ardour3/ardour_vst.exe.so +%%VST%%lib/ardour3/libardourgtk.so +lib/ardour3/libardour.so +lib/ardour3/libardour.so.3 +lib/ardour3/libardour.so.3.0.0 +lib/ardour3/libardourcp.so +lib/ardour3/libardourcp.so.4 +lib/ardour3/libardourcp.so.4.1.0 +lib/ardour3/libaudiographer.so +lib/ardour3/libaudiographer.so.0 +lib/ardour3/libaudiographer.so.0.0.0 +lib/ardour3/libclearlooks.so +lib/ardour3/libevoral.so +lib/ardour3/libevoral.so.0 +lib/ardour3/libevoral.so.0.0.0 +lib/ardour3/libgtkmm2ext.so +lib/ardour3/libgtkmm2ext.so.0 +lib/ardour3/libgtkmm2ext.so.0.8.3 +lib/ardour3/libmidipp.so +lib/ardour3/libmidipp.so.4 +lib/ardour3/libmidipp.so.4.1.0 +lib/ardour3/libpbd.so +lib/ardour3/libpbd.so.4 +lib/ardour3/libpbd.so.4.1.0 +lib/ardour3/libqmdsp.so +lib/ardour3/libqmdsp.so.0 +lib/ardour3/libqmdsp.so.0.0.0 +lib/ardour3/librubberband.so +lib/ardour3/librubberband.so.4 +lib/ardour3/librubberband.so.4.1.0 +lib/ardour3/libsmf.so +lib/ardour3/libtaglib.so +lib/ardour3/libtaglib.so.0 +lib/ardour3/libtaglib.so.0.0.0 +lib/ardour3/libtimecode.so +lib/ardour3/libtimecode.so.0 +lib/ardour3/libtimecode.so.0.0.0 +lib/ardour3/libvamphost.so +lib/ardour3/libvamphost.so.0 +lib/ardour3/libvamphost.so.0.0.0 +lib/ardour3/libvampplugin.so +lib/ardour3/libvampplugin.so.0 +lib/ardour3/libvampplugin.so.0.0.0 +lib/ardour3/sanityCheck +lib/ardour3/panners/libpan2in2out.so.1.0.0 +lib/ardour3/panners/libpan2in2out.so.1 +lib/ardour3/panners/libpan2in2out.so +lib/ardour3/panners/libpan1in2out.so.1.0.0 +lib/ardour3/panners/libpan1in2out.so.1 +lib/ardour3/panners/libpan1in2out.so +lib/ardour3/panners/libpanvbap.so.1.0.0 +lib/ardour3/panners/libpanvbap.so.1 +lib/ardour3/panners/libpanvbap.so +@dirrm lib/ardour3/panners +lib/ardour3/surfaces/libardour_generic_midi.so.4.1.0 +lib/ardour3/surfaces/libardour_generic_midi.so.4 +lib/ardour3/surfaces/libardour_generic_midi.so +lib/ardour3/surfaces/libardour_mcp.so.4.1.0 +lib/ardour3/surfaces/libardour_mcp.so.4 +lib/ardour3/surfaces/libardour_mcp.so +lib/ardour3/surfaces/libardour_osc.so.4.1.0 +lib/ardour3/surfaces/libardour_osc.so.4 +lib/ardour3/surfaces/libardour_osc.so +@dirrm lib/ardour3/surfaces +lib/ardour3/vamp/libardourvampplugins.so.0.0.0 +lib/ardour3/vamp/libardourvampplugins.so.0 +lib/ardour3/vamp/libardourvampplugins.so +@dirrm lib/ardour3/vamp +@dirrm lib/ardour3 +share/ardour3/splash.png +share/ardour3/export/CD (Red Book).format +share/ardour3/export/CD + DVD-A.preset +share/ardour3/export/CD + FLAC (tagged).preset +share/ardour3/export/CD + FLAC.preset +share/ardour3/export/CD + Ogg_Vorbis (tagged).preset +share/ardour3/export/CD + Ogg_Vorbis + FLAC (tagged).preset +share/ardour3/export/CD + Ogg_Vorbis.preset +share/ardour3/export/CD only.preset +share/ardour3/export/DVD-A only.preset +share/ardour3/export/DVD-A.format +share/ardour3/export/FLAC (tagged).preset +share/ardour3/export/FLAC 24 bit (tagged).format +share/ardour3/export/FLAC 24 bit .format +share/ardour3/export/FLAC.preset +share/ardour3/export/Ogg_Vorbis (tagged).format +share/ardour3/export/Ogg_Vorbis (tagged).preset +share/ardour3/export/Ogg_Vorbis + FLAC (tagged).preset +share/ardour3/export/Ogg_Vorbis + FLAC.preset +share/ardour3/export/Ogg_Vorbis .preset +share/ardour3/export/Ogg_Vorbis.format +@dirrm share/ardour3/export +share/ardour3/icons/act-disabled.png +share/ardour3/icons/add.png +share/ardour3/icons/application-x-ardour_16px.png +share/ardour3/icons/application-x-ardour_22px.png +share/ardour3/icons/application-x-ardour_32px.png +share/ardour3/icons/application-x-ardour_48px.png +share/ardour3/icons/ardour_icon_16px.png +share/ardour3/icons/ardour_icon_22px.png +share/ardour3/icons/ardour_icon_32px.png +share/ardour3/icons/ardour_icon_48px.png +share/ardour3/icons/chord.png +share/ardour3/icons/close.png +share/ardour3/icons/computer_keyboard.png +share/ardour3/icons/computer_keyboard_active.png +share/ardour3/icons/crossfade-in-S1.png +share/ardour3/icons/crossfade-in-S2.png +share/ardour3/icons/crossfade-in-constant-power.png +share/ardour3/icons/crossfade-in-fast-cut.png +share/ardour3/icons/crossfade-in-linear.png +share/ardour3/icons/crossfade-in-long-cut.png +share/ardour3/icons/crossfade-in-short-cut.png +share/ardour3/icons/crossfade-in-slow-cut.png +share/ardour3/icons/crossfade-out-S1.png +share/ardour3/icons/crossfade-out-S2.png +share/ardour3/icons/crossfade-out-constant-power.png +share/ardour3/icons/crossfade-out-fast-cut.png +share/ardour3/icons/crossfade-out-linear.png +share/ardour3/icons/crossfade-out-long-cut.png +share/ardour3/icons/crossfade-out-short-cut.png +share/ardour3/icons/crossfade-out-slow-cut.png +share/ardour3/icons/eighthnote.png +share/ardour3/icons/expand_left_right_cursor.png +share/ardour3/icons/expand_up_down_cursor.png +share/ardour3/icons/fade_in_cursor.png +share/ardour3/icons/fade_out_cursor.png +share/ardour3/icons/fader_belt.png +share/ardour3/icons/fader_belt_h.png +share/ardour3/icons/fader_belt_h_thin.png +share/ardour3/icons/ferret_02.png +share/ardour3/icons/forte.png +share/ardour3/icons/fortissimo.png +share/ardour3/icons/fortississimo.png +share/ardour3/icons/grabber.png +share/ardour3/icons/grabber_edit_point.png +share/ardour3/icons/grabber_note.png +share/ardour3/icons/halfnote.png +share/ardour3/icons/hide.png +share/ardour3/icons/i_beam_cursor.png +share/ardour3/icons/join_tools.png +share/ardour3/icons/knob.png +share/ardour3/icons/metronome.png +share/ardour3/icons/mezzforte.png +share/ardour3/icons/mezzoforte.png +share/ardour3/icons/mezzopiano.png +share/ardour3/icons/midi-input-active.png +share/ardour3/icons/midi-input-inactive.png +share/ardour3/icons/midi_socket_small.png +share/ardour3/icons/midi_sound_notes.png +share/ardour3/icons/midi_tool_erase.png +share/ardour3/icons/midi_tool_pencil.png +share/ardour3/icons/midi_tool_select.png +share/ardour3/icons/move_cursor.png +share/ardour3/icons/mute-disabled.png +share/ardour3/icons/mute-enabled.png +share/ardour3/icons/muted-by-others.png +share/ardour3/icons/nudge_left.png +share/ardour3/icons/nudge_right.png +share/ardour3/icons/pianissimo.png +share/ardour3/icons/pianississimo.png +share/ardour3/icons/piano.png +share/ardour3/icons/quarternote.png +share/ardour3/icons/rec-enabled.png +share/ardour3/icons/rec-in-progress.png +share/ardour3/icons/record-normal-disabled.png +share/ardour3/icons/record-normal-enabled.png +share/ardour3/icons/record-normal-in-progress.png +share/ardour3/icons/record-step.png +share/ardour3/icons/record_disabled_grey.png +share/ardour3/icons/record_normal_red.png +share/ardour3/icons/record_tape_red.png +share/ardour3/icons/resize_bottom_cursor.png +share/ardour3/icons/resize_bottom_left_cursor.png +share/ardour3/icons/resize_bottom_right_cursor.png +share/ardour3/icons/resize_left_cursor.png +share/ardour3/icons/resize_right_cursor.png +share/ardour3/icons/resize_top_cursor.png +share/ardour3/icons/resize_top_left_cursor.png +share/ardour3/icons/resize_top_right_cursor.png +share/ardour3/icons/sae.png +share/ardour3/icons/sixteenthnote.png +share/ardour3/icons/sixtyfourthnote.png +share/ardour3/icons/solo-disabled.png +share/ardour3/icons/solo-enabled.png +share/ardour3/icons/solo-isolate-disabled.png +share/ardour3/icons/solo-isolate-enabled.png +share/ardour3/icons/solo-isolated.png +share/ardour3/icons/solo-safe-disabled.png +share/ardour3/icons/solo-safe-enabled.png +share/ardour3/icons/solo-safe-icon.png +share/ardour3/icons/soloed-by-others.png +share/ardour3/icons/step-editing.png +share/ardour3/icons/strip_width.png +share/ardour3/icons/tav_exp.png +share/ardour3/icons/tav_shrink.png +share/ardour3/icons/thirtysecondnote.png +share/ardour3/icons/tool_audition.png +share/ardour3/icons/tool_gain.png +share/ardour3/icons/tool_note.png +share/ardour3/icons/tool_object.png +share/ardour3/icons/tool_object_range.png +share/ardour3/icons/tool_range.png +share/ardour3/icons/tool_stretch.png +share/ardour3/icons/tool_zoom.png +share/ardour3/icons/transport_end.png +share/ardour3/icons/transport_loop.png +share/ardour3/icons/transport_play.png +share/ardour3/icons/transport_range.png +share/ardour3/icons/transport_record.png +share/ardour3/icons/transport_start.png +share/ardour3/icons/transport_stop.png +share/ardour3/icons/trim_bottom_cursor.png +share/ardour3/icons/trim_left_cursor.png +share/ardour3/icons/trim_left_cursor_5.png +share/ardour3/icons/trim_left_cursor_right_only.png +share/ardour3/icons/trim_right_cursor.png +share/ardour3/icons/trim_right_cursor_5.png +share/ardour3/icons/trim_right_cursor_left_only.png +share/ardour3/icons/trim_top_cursor.png +share/ardour3/icons/wholenote.png +share/ardour3/icons/zoom_full.png +share/ardour3/icons/zoom_in.png +share/ardour3/icons/zoom_in_cursor.png +share/ardour3/icons/zoom_out.png +share/ardour3/icons/zoom_out_cursor.png +@dirrm share/ardour3/icons +share/ardour3/midi_maps/DDX3216.map +share/ardour3/midi_maps/Korg_nanoKONTROL.map +share/ardour3/midi_maps/M-Audio_Axiom25.map +share/ardour3/midi_maps/Roland_SI-24.map +share/ardour3/midi_maps/bcf2000.map +share/ardour3/midi_maps/m-audio_oxygen8v2.map +share/ardour3/midi_maps/xboard-61.map +@dirrm share/ardour3/midi_maps +share/ardour3/pixmaps/forwardblarrow.xpm +share/ardour3/pixmaps/h_meter_strip.xpm +share/ardour3/pixmaps/hiin.xpm +share/ardour3/pixmaps/hiout.xpm +share/ardour3/pixmaps/hslider00.xpm +share/ardour3/pixmaps/hslider01.xpm +share/ardour3/pixmaps/left_arrow.xpm +share/ardour3/pixmaps/linin.xpm +share/ardour3/pixmaps/linout.xpm +share/ardour3/pixmaps/loin.xpm +share/ardour3/pixmaps/loop.xpm +share/ardour3/pixmaps/loout.xpm +share/ardour3/pixmaps/lr.xpm +share/ardour3/pixmaps/regin.xpm +share/ardour3/pixmaps/regin2.xpm +share/ardour3/pixmaps/regout.xpm +share/ardour3/pixmaps/regout2.xpm +share/ardour3/pixmaps/revdblarrow.xpm +share/ardour3/pixmaps/right_arrow.xpm +share/ardour3/pixmaps/set-next-button.xpm +share/ardour3/pixmaps/small-round-button-01.xpm +share/ardour3/pixmaps/small_x.xpm +share/ardour3/pixmaps/toggle-button-00.xpm +share/ardour3/pixmaps/toggle-button-01.xpm +share/ardour3/pixmaps/tool_audition.xpm +share/ardour3/pixmaps/tool_gain.xpm +share/ardour3/pixmaps/tool_object.xpm +share/ardour3/pixmaps/tool_range.xpm +share/ardour3/pixmaps/tool_stretch.xpm +share/ardour3/pixmaps/tool_zoom.xpm +share/ardour3/pixmaps/v_meter_strip.xpm +share/ardour3/pixmaps/vslider00.xpm +share/ardour3/pixmaps/vslider01.xpm +share/ardour3/pixmaps/vslider02_rail.xpm +share/ardour3/pixmaps/vslider02_slider.xpm +share/ardour3/pixmaps/vslider_slider_16wide.xpm +share/ardour3/pixmaps/zoom_full.xpm +share/ardour3/pixmaps/zoom_in.xpm +share/ardour3/pixmaps/zoom_out.xpm +@dirrm share/ardour3/pixmaps +share/ardour3/templates/16 Tracks.template +share/ardour3/templates/2 Track.template +share/ardour3/templates/32 Tracks.template +share/ardour3/templates/4 Tracks.template +share/ardour3/templates/8 Tracks.template +@dirrm share/ardour3/templates +@dirrm share/ardour3 +share/locale/cs/LC_MESSAGES/gtk2_ardour.mo +share/locale/de/LC_MESSAGES/gtk2_ardour.mo +share/locale/el/LC_MESSAGES/libardour3.mo +share/locale/el/LC_MESSAGES/gtk2_ardour.mo share/locale/el_GR/LC_MESSAGES/libgtkmm2ext.mo -share/locale/el_GR/LC_MESSAGES/libardour2.mo -share/locale/el_GR/LC_MESSAGES/gtk2_ardour.mo -share/locale/ru_RU/LC_MESSAGES/libgtkmm2ext.mo -share/locale/ru_RU/LC_MESSAGES/libardour2.mo -share/locale/ru_RU/LC_MESSAGES/gtk2_ardour.mo -share/locale/pt_BR/LC_MESSAGES/libgtkmm2ext.mo -share/locale/pt_BR/LC_MESSAGES/gtk2_ardour.mo -share/locale/pt_PT/LC_MESSAGES/gtk2_ardour.mo share/locale/es_ES/LC_MESSAGES/libgtkmm2ext.mo -share/locale/es_ES/LC_MESSAGES/gtk2_ardour.mo -share/locale/fr_FR/LC_MESSAGES/gtk2_ardour.mo -share/locale/it_IT/LC_MESSAGES/libardour2.mo -share/locale/it_IT/LC_MESSAGES/gtk2_ardour.mo -share/locale/sv_SE/LC_MESSAGES/libardour2.mo -share/locale/sv_SE/LC_MESSAGES/gtk2_ardour.mo -share/locale/de_DE/LC_MESSAGES/gtk2_ardour.mo -share/locale/pl_PL/LC_MESSAGES/libardour2.mo +share/locale/es/LC_MESSAGES/libardour3.mo +share/locale/es/LC_MESSAGES/gtk2_ardour.mo +share/locale/fr/LC_MESSAGES/gtk2_ardour.mo +share/locale/it/LC_MESSAGES/libardour3.mo +share/locale/it/LC_MESSAGES/gtk2_ardour.mo +share/locale/nn/LC_MESSAGES/libardour3.mo +share/locale/nn/LC_MESSAGES/gtk2_ardour.mo +share/locale/pl/LC_MESSAGES/libardour3.mo +share/locale/pl/LC_MESSAGES/gtk2_ardour.mo share/locale/pl_PL/LC_MESSAGES/libgtkmm2ext.mo -share/locale/pl_PL/LC_MESSAGES/gtk2_ardour.mo -share/locale/es_ES/LC_MESSAGES/libardour2.mo -share/locale/fr_FR/LC_MESSAGES/libardour2.mo -share/locale/cs_CZ/LC_MESSAGES/gtk2_ardour.mo -share/locale/nn_NO/LC_MESSAGES/gtk2_ardour.mo -@dirrmtry share/locale/pl_PL/LC_MESSAGES -@dirrmtry share/locale/pl_PL -@dirrmtry share/locale/it_IT/LC_MESSAGES -@dirrmtry share/locale/it_IT -@dirrmtry share/locale/sv_SE/LC_MESSAGES -@dirrmtry share/locale/sv_SE +share/locale/pt/LC_MESSAGES/gtk2_ardour.mo +share/locale/pt_BR/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/libardour3.mo +share/locale/ru_RU/LC_MESSAGES/libgtkmm2ext.mo +share/locale/sv/LC_MESSAGES/libardour3.mo +share/locale/sv/LC_MESSAGES/gtk2_ardour.mo +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el @dirrmtry share/locale/el_GR/LC_MESSAGES @dirrmtry share/locale/el_GR +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/pl_PL/LC_MESSAGES +@dirrmtry share/locale/pl_PL +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt @dirrmtry share/locale/ru_RU/LC_MESSAGES @dirrmtry share/locale/ru_RU -@dirrmtry share/locale/de_DE/LC_MESSAGES -@dirrmtry share/locale/de_DE -@dirrmtry share/locale/cs_CZ/LC_MESSAGES -@dirrmtry share/locale/cs_CZ -@dirrmtry share/locale/nn_NO/LC_MESSAGES -@dirrmtry share/locale/nn_NO Index: files/patch-SConstruct =================================================================== RCS file: /home/pcvs/ports/audio/ardour/files/patch-SConstruct,v retrieving revision 1.14 diff -u -p -r1.14 patch-SConstruct --- files/patch-SConstruct 20 Sep 2009 00:23:02 -0000 1.14 +++ files/patch-SConstruct 30 Aug 2011 15:51:19 -0000 @@ -1,109 +0,0 @@ ---- SConstruct.orig 2009-07-20 17:55:10.000000000 +0200 -+++ SConstruct 2009-09-15 12:54:21.000000000 +0200 -@@ -48,7 +48,7 @@ - BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1), - BoolOption('LIBLO', 'Compile with support for liblo library', 1), - BoolOption('NLS', 'Set to turn on i18n support', 1), -- PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'), -+ PathOption('PREFIX', 'Set the install "prefix"', '/usr/local', PathOption.PathIsDirCreate), - BoolOption('SURFACES', 'Build support for control surfaces', 1), - BoolOption('WIIMOTE', 'Build the wiimote control surface', 0), - ('LIBDIR', 'Set librarydir (typically lib or lib64)', 'lib'), -@@ -679,9 +679,9 @@ - opt_flags.extend (["-mhard-float", "-mpowerpc-gfxopt"]) - opt_flags.extend (["-Os"]) - --elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_64", config[config_cpu]) != None)) and env['DIST_TARGET'] != 'none': -+elif ((re.search ("i[0-9]86", env['DIST_TARGET']) != None) or (re.search ("x86_64", env['DIST_TARGET']) != None)): - -- build_host_supports_sse = 0 -+ build_host_supports_sse = 1 - - # - # ARCH_X86 means anything in the x86 family from i386 to x86_64 -@@ -740,12 +740,7 @@ - print "\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be anerror, especially if you are a package maintainer)" - # end optimization section - --# handle x86/x86_64 libdir properly -- --if env['DIST_TARGET'] == 'x86_64': -- env['LIBDIR']='lib64' --else: -- env['LIBDIR']='lib' -+env['LIBDIR']='lib' - - # - # no VST on x86_64 -@@ -794,13 +789,7 @@ - # 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)) -@@ -889,6 +878,7 @@ - - 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'): -@@ -961,6 +951,7 @@ - if env['LIBLO']: - libraries['lo'] = LibraryInfo () - prep_libcheck(env, libraries['lo']) -+ libraries['lo'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib") - - conf = Configure (libraries['lo']) - if conf.CheckLib ('lo', 'lo_server_new') == False: -@@ -974,6 +965,7 @@ - - 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 -@@ -1031,8 +1023,10 @@ - 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" - - env = conf.Finish() - -@@ -1091,7 +1085,7 @@ - - # libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas') - libraries['soundtouch'] = LibraryInfo() -- libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0') -+ libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.4') - # Comment the previous line and uncomment this for old versions of Debian: - #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') - -@@ -1321,8 +1315,8 @@ - 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'): Index: files/patch-gtk2_ardour-ardour_ui.cc =================================================================== RCS file: /home/pcvs/ports/audio/ardour/files/patch-gtk2_ardour-ardour_ui.cc,v retrieving revision 1.1 diff -u -p -r1.1 patch-gtk2_ardour-ardour_ui.cc --- files/patch-gtk2_ardour-ardour_ui.cc 18 Mar 2007 22:11:38 -0000 1.1 +++ files/patch-gtk2_ardour-ardour_ui.cc 30 Aug 2011 15:41:57 -0000 @@ -1,6 +1,6 @@ ---- gtk2_ardour/ardour_ui.cc.orig Sat Mar 17 02:55:45 2007 -+++ gtk2_ardour/ardour_ui.cc Sun Mar 18 14:44:03 2007 -@@ -28,6 +28,8 @@ +--- gtk2_ardour/ardour_ui.cc.orig ++++ gtk2_ardour/ardour_ui.cc +@@ -35,6 +35,8 @@ #include #include @@ -9,7 +9,7 @@ #include #include -@@ -456,8 +458,11 @@ +@@ -737,8 +739,11 @@ ARDOUR_UI::check_memory_locking () struct rlimit limits; int64_t ram; long pages, page_size; @@ -22,12 +22,12 @@ ram = 0; } else { ram = (int64_t) pages * (int64_t) page_size; -@@ -476,7 +481,7 @@ - "This might cause Ardour 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")); -+ "and it is normally controlled by /etc/login.conf")); - +@@ -758,7 +763,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"), ++ "and it is normally controlled by /etc/login.conf"), + PROGRAM_NAME).c_str()); + VBox* vbox = msg.get_vbox(); - HBox hbox; Index: files/patch-gtk2_ardour-engine_dialog.cc =================================================================== RCS file: /home/pcvs/ports/audio/ardour/files/patch-gtk2_ardour-engine_dialog.cc,v retrieving revision 1.3 diff -u -p -r1.3 patch-gtk2_ardour-engine_dialog.cc --- files/patch-gtk2_ardour-engine_dialog.cc 11 Apr 2008 16:48:29 -0000 1.3 +++ files/patch-gtk2_ardour-engine_dialog.cc 1 Nov 2011 23:49:37 -0000 @@ -1,6 +1,6 @@ ---- 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 @@ +--- gtk2_ardour/engine_dialog.cc.orig ++++ gtk2_ardour/engine_dialog.cc +@@ -35,7 +35,7 @@ #include #include #include @@ -9,7 +9,7 @@ #include #endif -@@ -113,7 +113,9 @@ +@@ -140,7 +140,9 @@ EngineControl::EngineControl () #ifdef __APPLE__ strings.push_back (X_("CoreAudio")); #else @@ -17,54 +17,54 @@ strings.push_back (X_("ALSA")); +#endif strings.push_back (X_("OSS")); + strings.push_back (X_("FreeBoB")); strings.push_back (X_("FFADO")); - #endif -@@ -158,7 +160,7 @@ +@@ -197,7 +199,7 @@ EngineControl::EngineControl () 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"))); + label = manage (new Label (_("Number of buffers:"))); + label->set_alignment (0, 0.5); 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 @@ +@@ -219,7 +221,7 @@ EngineControl::EngineControl () row++; /* no audio mode with CoreAudio, its duplex or nuthin' */ -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(__FreeBSD__) - label = manage (new Label (_("Audio Mode"))); + label = manage (new Label (_("Audio mode:"))); + label->set_alignment (0, 0.5); 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 (); +@@ -262,7 +264,7 @@ EngineControl::EngineControl () + + #if PROVIDE_TOO_MANY_OPTIONS -#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 @@ +@@ -319,7 +321,7 @@ EngineControl::EngineControl () 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); + label = manage (new Label (_("Dither:"))); + label->set_alignment (0, 0.5); options_packer.attach (dither_mode_combo, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0)); -@@ -299,7 +301,7 @@ +@@ -350,7 +352,7 @@ EngineControl::EngineControl () 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); + label = manage (new Label (_("Input device:"))); + label->set_alignment (0, 0.5); device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0); -@@ -570,7 +572,7 @@ +@@ -681,7 +683,7 @@ EngineControl::setup_engine () void EngineControl::realtime_changed () { @@ -73,7 +73,7 @@ priority_spinner.set_sensitive (realtime_button.get_active()); #endif } -@@ -586,8 +588,10 @@ +@@ -697,8 +699,10 @@ EngineControl::enumerate_devices (const #endif #ifndef __APPLE__ @@ -81,10 +81,10 @@ } else if (driver == "ALSA") { devices[driver] = enumerate_alsa_devices (); +#endif + } else if (driver == "FreeBOB") { + devices[driver] = enumerate_freebob_devices (); } else if (driver == "FFADO") { - devices[driver] = enumerate_ffado_devices (); - } else if (driver == "OSS") { -@@ -714,6 +718,7 @@ +@@ -827,6 +831,7 @@ Ardour and choose the relevant device th return devs; } #else @@ -92,7 +92,7 @@ vector EngineControl::enumerate_alsa_devices () { -@@ -774,6 +779,7 @@ +@@ -870,6 +875,7 @@ EngineControl::enumerate_alsa_devices () return devs; } @@ -100,17 +100,7 @@ vector EngineControl::enumerate_ffado_devices () -@@ -816,7 +822,9 @@ - vector& 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 @@ +@@ -963,7 +971,7 @@ void EngineControl::redisplay_latency () { uint32_t rate = get_rate(); Index: files/patch-gtk2_ardour-new_session_dialog.cc =================================================================== RCS file: /home/pcvs/ports/audio/ardour/files/patch-gtk2_ardour-new_session_dialog.cc,v retrieving revision 1.1 diff -u -p -r1.1 patch-gtk2_ardour-new_session_dialog.cc --- files/patch-gtk2_ardour-new_session_dialog.cc 19 Jan 2008 18:25:33 -0000 1.1 +++ files/patch-gtk2_ardour-new_session_dialog.cc 30 Aug 2011 15:50:43 -0000 @@ -1,11 +0,0 @@ ---- 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]; - Index: files/patch-libs-midi++2-SConscript =================================================================== RCS file: /home/pcvs/ports/audio/ardour/files/patch-libs-midi++2-SConscript,v retrieving revision 1.1 diff -u -p -r1.1 patch-libs-midi++2-SConscript --- files/patch-libs-midi++2-SConscript 8 Dec 2006 21:53:44 -0000 1.1 +++ files/patch-libs-midi++2-SConscript 30 Aug 2011 15:51:11 -0000 @@ -1,12 +0,0 @@ ---- 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") Index: files/patch-vst-SConscript =================================================================== RCS file: /home/pcvs/ports/audio/ardour/files/patch-vst-SConscript,v retrieving revision 1.1 diff -u -p -r1.1 patch-vst-SConscript --- files/patch-vst-SConscript 14 Apr 2007 17:28:52 -0000 1.1 +++ files/patch-vst-SConscript 30 Aug 2011 15:51:41 -0000 @@ -1,11 +0,0 @@ ---- 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" - Index: files/patch-libs-pdb-cpus.cc @@ -0,0 +1,10 @@ +--- libs/pbd/cpus.cc.orig ++++ libs/pbd/cpus.cc +@@ -25,6 +25,7 @@ + #ifdef __linux__ + #include + #elif defined(__APPLE__) || defined(__FreeBSD__) ++#include + #include + #include + #endif Index: files/patch-wscript @@ -0,0 +1,13 @@ +--- wscript.orig ++++ wscript +@@ -519,8 +525,9 @@ def configure(conf): + # Fix utterly braindead FLAC include path to not smash assert.h + conf.env['INCLUDES_FLAC'] = [] + +- conf.check_cc(function_name='dlopen', header_name='dlfcn.h', linkflags='-ldl', uselib_store='DL') ++ conf.check_cc(function_name='dlopen', header_name='dlfcn.h', linkflags='', uselib_store='DL') + conf.check_cc(function_name='curl_global_init', header_name='curl/curl.h', linkflags='-lcurl', uselib_store='CURL') ++ conf.check_cc(function_name='backtrace_symbols', header_name='execinfo.h', linkflags='-lexecinfo', uselib_store='EXECINFO') + + # Tell everyone that this is a waf build + Index: files/svn_revision.cc @@ -0,0 +1,3 @@ +#include "ardour/svn_revision.h" + +namespace ARDOUR { const char* svn_revision = "r10465"; } Index: files/patch-libs-ardour-session_lxvst.cc @@ -0,0 +1,18 @@ +--- libs/ardour/session_lxvst.cc.orig ++++ libs/ardour/session_lxvst.cc +@@ -65,13 +65,13 @@ intptr_t Session::lxvst_callback (AEffec + { + plug = (LXVSTPlugin*) (effect->user); + session = &plug->session(); +- SHOW_CALLBACK ("am callback 0x%x, opcode = %d, plugin = \"%s\" ", (unsigned int)pthread_self(), opcode, plug->name()); ++ SHOW_CALLBACK ("am callback 0x%lx, opcode = %d, plugin = \"%s\" ", (unsigned long)pthread_self(), opcode, plug->name()); + } + else + { + plug = 0; + session = 0; +- SHOW_CALLBACK ("am callback 0x%x, opcode = %d", (unsigned int)pthread_self(), opcode); ++ SHOW_CALLBACK ("am callback 0x%lx, opcode = %d", (unsigned long)pthread_self(), opcode); + } + + switch(opcode){ Index: files/patch-libs-surfaces-wscript @@ -0,0 +1,11 @@ +--- libs/surfaces/wscript.orig ++++ libs/surfaces/wscript +@@ -49,7 +49,7 @@ def configure(conf): + conf.define('BUILD_TRANZPORT', 1) + + #conf.check_cc (lib='libusb', header_name='libusb.h', function_name='usb_interrupt_write', define_name='BUILD_TRANZPORT') +- conf.check_cc (header_name='linux/input.h', define_name='BUILD_POWERMATE',mandatory=False) ++ #conf.check_cc (header_name='linux/input.h', define_name='BUILD_POWERMATE',mandatory=False) + conf.check_cc (lib='lo', header_name='lo/lo.h', function_name='lo_server_new', define_name='BUILD_OSC',mandatory=False) + + if Options.options.wiimote: