Index: head/audio/ardour/Makefile =================================================================== --- head/audio/ardour/Makefile (revision 222586) +++ head/audio/ardour/Makefile (revision 222587) @@ -1,112 +1,117 @@ # New ports collection makefile for: ardour # Date created: 2006-12-04 # Whom: trasz # # $FreeBSD$ # PORTNAME= ardour -PORTVERSION= 2.4.1 -PORTREVISION= 1 +PORTVERSION= 2.5 CATEGORIES= audio -MASTER_SITES= http://ardour.org/files/releases/ +MASTER_SITES= http://releases.ardour.org/ DISTFILES= ardour-${DISTVERSION}.tar.bz2 EXTRACT_ONLY= ardour-${DISTVERSION}.tar.bz2 MAINTAINER= trasz@FreeBSD.org COMMENT= Ardour - a digital audio workstation LIB_DEPENDS= lrdf.2:${PORTSDIR}/textproc/liblrdf \ raptor.2:${PORTSDIR}/textproc/raptor \ samplerate.1:${PORTSDIR}/audio/libsamplerate \ jack.0:${PORTSDIR}/audio/jack \ sndfile.1:${PORTSDIR}/audio/libsndfile \ boost_date_time.4:${PORTSDIR}/devel/boost \ gnomecanvasmm-2.6:${PORTSDIR}/graphics/libgnomecanvasmm26 \ sqlite3:${PORTSDIR}/databases/sqlite3 \ lo.6:${PORTSDIR}/audio/liblo \ SoundTouch.0:${PORTSDIR}/audio/soundtouch \ usb:${PORTSDIR}/devel/libusb \ fftw3f:${PORTSDIR}/math/fftw3-float \ - fftw3:${PORTSDIR}/math/fftw3 + fftw3:${PORTSDIR}/math/fftw3 \ + aubio.3:${PORTSDIR}/audio/aubio +BUILD_DEPENDS= jackit>=0.109.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_GETTEXT= yes USE_LDCONFIG= ${PREFIX}/lib/ardour2 ${PREFIX}/lib/ardour2/surfaces TEMPLATESDIR= ${PREFIX}/share/ardour2/templates PLIST_SUB= DISTVERSION=${DISTVERSION} OPTIONS= OPTIMIZED_CFLAGS "Builds with compiler optimizations" on \ VST "Enable VST plugins support" off .include .if defined(WITH_VST) # Yes, 'PlugIns' is not a typo. VST_DIST+= vst_sdk2_3.zip RESTRICTED= Redistribution of the VST PlugIns SDK is not allowed RESTRICTED_FILES= ${VST_DIST} DISTFILES+= ${VST_DIST} SCONS_ENV+= VST=yes BUILD_DEPENDS+= winegcc:${PORTSDIR}/emulators/wine \ unzip:${PORTSDIR}/archivers/unzip \ gsed:${PORTSDIR}/textproc/gsed LIB_DEPENDS+= wine.1:${PORTSDIR}/emulators/wine .if !exists(${DISTDIR}/${VST_DIST}) IGNORE= download the VST 2.3 SDK from Steinberg (http://www.steinberg.de/331+M52087573ab0.html) and copy ${VST_DIST} into ${DISTDIR} .endif PLIST_SUB+= NO_VST="@comment " PLIST_SUB+= VST="" .else PLIST_SUB+= NO_VST="" PLIST_SUB+= VST="@comment " .endif .if ${ARCH} == "sparc64" BROKEN= Does not install .endif # Upstream uses these flags by default. .if !defined(WITHOUT_OPTIMIZED_CFLAGS) CFLAGS+= -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce .if ${ARCH} == "amd64" SCONS_ENV+= DIST_TARGET=x86_64 SCONS_ENV+= FPU_OPTIMIZATION=1 .elif ${MACHINE_CPU:Msse} SCONS_ENV+= DIST_TARGET=i686 SCONS_ENV+= FPU_OPTIMIZATION=1 .else SCONS_ENV+= DIST_TARGET=i386 SCONS_ENV+= FPU_OPTIMIZATION=0 .endif .else SCONS_ENV+= FPU_OPTIMIZATION=0 .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 .if defined(WITH_VST) ${CP} ${DISTDIR}/${VST_DIST} ${WRKSRC}/libs/fst/ .endif 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}/ .include Property changes on: head/audio/ardour/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.24 \ No newline at end of property +1.25 \ No newline at end of property Index: head/audio/ardour/distinfo =================================================================== --- head/audio/ardour/distinfo (revision 222586) +++ head/audio/ardour/distinfo (revision 222587) @@ -1,6 +1,6 @@ -MD5 (ardour-2.4.1.tar.bz2) = f132caaf613f3cb44ca9f9dafb38fbae -SHA256 (ardour-2.4.1.tar.bz2) = 29d6ca482e13e58058616b6118a0d036429db2141fbd95811d7ad7536690484e -SIZE (ardour-2.4.1.tar.bz2) = 3147427 +MD5 (ardour-2.5.tar.bz2) = 88180d400e8c19ceea41aabadc098116 +SHA256 (ardour-2.5.tar.bz2) = 735611e2fe44626adbb46567b14c3d9e700bb8ad0556dafa0688ea87032d14a3 +SIZE (ardour-2.5.tar.bz2) = 3254328 MD5 (vst_sdk2_3.zip) = c91d3be58ad4e9c695d0a90b2198be0d SHA256 (vst_sdk2_3.zip) = 5400e0bbfeef0ab8a67b48899a9e8067db47552f43b30d8d15323ab999523226 SIZE (vst_sdk2_3.zip) = 4147357 Property changes on: head/audio/ardour/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.15 \ No newline at end of property +1.16 \ No newline at end of property Index: head/audio/ardour/files/patch-SConstruct =================================================================== --- head/audio/ardour/files/patch-SConstruct (revision 222586) +++ head/audio/ardour/files/patch-SConstruct (revision 222587) @@ -1,131 +1,144 @@ ---- SConstruct.orig 2008-02-06 18:54:40.000000000 +0100 -+++ SConstruct 2008-02-11 09:56:44.000000000 +0100 -@@ -41,7 +41,7 @@ +--- SConstruct.orig 2008-07-07 17:29:40.000000000 +0200 ++++ SConstruct 2008-07-22 20:53:29.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('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0), BoolOption('UNIVERSAL', 'Compile as universal binary. Requires that external libraries are already universal.', 0), -@@ -387,7 +387,7 @@ +@@ -397,7 +397,7 @@ # Make sure they know what they are doing # -if env['VST']: +if False: if os.path.isfile('.personal_use_only'): print "Enabling VST support. Note that distributing a VST-enabled ardour\nis a violation of several different licences.\nBuild with VST=false if you intend to distribute ardour to others." else: -@@ -663,9 +663,9 @@ +@@ -551,9 +551,9 @@ + + conf = Configure(libraries['aubio']) + +- if conf.CheckHeader ('aubio/aubio.h') == False: +- print ('AUBIO-related features be compiled without the aubio headers, which do not seem to be installed') +- env['AUBIO'] = 0 ++# if conf.CheckHeader ('aubio/aubio.h') == False: ++# print ('AUBIO-related features be compiled without the aubio headers, which do not seem to be installed') ++# env['AUBIO'] = 0 + conf.Finish() + + if env['FREESOUND']: +@@ -711,9 +711,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 debug_flags.append ("-DARCH_X86") opt_flags.append ("-DARCH_X86") -@@ -710,12 +710,7 @@ +@@ -758,12 +758,7 @@ print "\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be an error, especially if you are a package maintainer)" # end optimization section -# handle x86/x86_64 libdir properly - -if env['DIST_TARGET'] == 'x86_64': - env['LIBDIR']='lib64' -else: - env['LIBDIR']='lib' +env['LIBDIR']='lib' # # a single way to test if we're on OS X -@@ -746,13 +741,7 @@ +@@ -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)) -@@ -838,6 +827,7 @@ +@@ -890,6 +879,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'): -@@ -896,6 +886,7 @@ +@@ -948,6 +938,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: -@@ -909,6 +900,7 @@ +@@ -961,6 +952,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 -@@ -946,8 +938,10 @@ +@@ -1018,8 +1010,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() -@@ -1001,9 +995,9 @@ +@@ -1073,9 +1067,9 @@ # 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.0') # Comment the previous line and uncomment this for Debian: - libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') + #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', LIBPATH='#libs/appleutility', -@@ -1119,8 +1113,7 @@ +@@ -1191,8 +1185,7 @@ surface_subdirs = [ 'libs/surfaces/control_protocol', 'libs/surfaces/generic_midi', 'libs/surfaces/tranzport', - 'libs/surfaces/mackie', - 'libs/surfaces/powermate' + 'libs/surfaces/mackie' ] if env['SURFACES']: -@@ -1225,8 +1218,8 @@ +@@ -1297,8 +1290,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'): Property changes on: head/audio/ardour/files/patch-SConstruct ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property Index: head/audio/ardour/pkg-plist =================================================================== --- head/audio/ardour/pkg-plist (revision 222586) +++ head/audio/ardour/pkg-plist (revision 222587) @@ -1,160 +1,162 @@ %%NO_VST%%bin/ardour2 %%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/SAE-de.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/crossfade_out_dipped.png share/ardour2/icons/crossfade_in_transition.png share/ardour2/icons/tool_stretch.png share/ardour2/icons/crossfade_in_constant.png share/ardour2/icons/zoom_full.png share/ardour2/icons/crossfade_in_dipped.png share/ardour2/icons/tool_object.png share/ardour2/icons/transport_play.png share/ardour2/icons/fader_belt.png share/ardour2/icons/crossfade_in_fast-cut.png share/ardour2/icons/crossfade_out_fast-cut.png share/ardour2/icons/record_normal_red.png share/ardour2/icons/crossfade_out_transition.png share/ardour2/icons/crossfade_out_slow-cut.png share/ardour2/icons/crossfade_in_slow-cut.png share/ardour2/icons/crossfade_in_default.png share/ardour2/icons/crossfade_out_default.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/crossfade_out_constant.png share/ardour2/icons/tool_gain.png share/ardour2/icons/crossfade_in_slow-fade.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/crossfade_out_slow-fade.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 @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 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/po_PO/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/pl_PL/LC_MESSAGES/libgtkmm2ext.mo +share/locale/pl_PL/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 @dirrmtry share/locale/el_GR/LC_MESSAGES @dirrmtry share/locale/el_GR @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/po_PO/LC_MESSAGES -@dirrmtry share/locale/po_PO Property changes on: head/audio/ardour/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.15 \ No newline at end of property +1.16 \ No newline at end of property