From 4c08c9f47787c96b3d903b4be5e63cff5e9361d7 Mon Sep 17 00:00:00 2001 From: danfe Date: Sun, 20 Sep 2009 00:23:02 +0000 Subject: - Unbreak the build against SoundToutch (detect it correctly) [1] - Should build on amd64 fine, remove BROKEN statement [2] - Primary master site no longer allows direct downloads, comment it out - COMMENT should not contain package name: it's redundant; fix this - Clean up Makefile header while here Submitted by: trasz [1, 2] Feature safe: yes --- audio/ardour/Makefile | 17 +++++++---------- audio/ardour/files/patch-SConstruct | 35 ++++++++++++++++++++++------------- 2 files changed, 29 insertions(+), 23 deletions(-) (limited to 'audio') diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile index 890b5e87fb76..a73ec595ec20 100644 --- a/audio/ardour/Makefile +++ b/audio/ardour/Makefile @@ -1,6 +1,6 @@ -# New ports collection makefile for: ardour -# Date created: 2006-12-04 -# Whom: trasz +# New ports collection makefile for: Ardour +# Date created: 2006-12-04 +# Whom: Edward Tomasz Napierala # # $FreeBSD$ # @@ -8,12 +8,13 @@ PORTNAME= ardour PORTVERSION= 2.8.2 CATEGORIES= audio -MASTER_SITES= http://releases.ardour.org/ \ - ${MASTER_SITE_LOCAL} +MASTER_SITES= ${MASTER_SITE_LOCAL} \ + http://freebsd.nsu.ru/distfiles/ \ + #http://releases.ardour.org/ MASTER_SITE_SUBDIR= trasz MAINTAINER= danfe@FreeBSD.org -COMMENT= Ardour - a digital audio workstation +COMMENT= A multichannel digital audio workstation LIB_DEPENDS= lrdf.2:${PORTSDIR}/textproc/liblrdf \ raptor.2:${PORTSDIR}/textproc/raptor \ @@ -56,10 +57,6 @@ BROKEN= needs posix_memalign() LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb .endif -.if ${ARCH} == "amd64" -BROKEN= does not compile -.endif - .if defined(WITH_VST) SCONS_ENV+= VST=yes BUILD_DEPENDS+= winegcc:${PORTSDIR}/emulators/wine \ diff --git a/audio/ardour/files/patch-SConstruct b/audio/ardour/files/patch-SConstruct index 3b66e07a1fb3..4f30853d4141 100644 --- a/audio/ardour/files/patch-SConstruct +++ b/audio/ardour/files/patch-SConstruct @@ -1,5 +1,5 @@ ---- SConstruct.orig 2008-12-02 11:02:40.000000000 +0100 -+++ SConstruct 2009-02-11 19:13:27.000000000 +0100 +--- 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), @@ -8,8 +8,8 @@ + 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), - 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), -@@ -702,9 +702,9 @@ + ('LIBDIR', 'Set librarydir (typically lib or lib64)', 'lib'), +@@ -679,9 +679,9 @@ opt_flags.extend (["-mhard-float", "-mpowerpc-gfxopt"]) opt_flags.extend (["-Os"]) @@ -21,8 +21,8 @@ # # ARCH_X86 means anything in the x86 family from i386 to x86_64 -@@ -755,12 +755,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)" +@@ -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 @@ -34,8 +34,8 @@ +env['LIBDIR']='lib' # - # a single way to test if we're on OS X -@@ -798,13 +793,7 @@ + # no VST on x86_64 +@@ -794,13 +789,7 @@ # prepend boiler plate optimization flags # @@ -50,7 +50,7 @@ if env['DEBUG'] == 1: env.Append(CCFLAGS=" ".join (debug_flags)) -@@ -896,6 +885,7 @@ +@@ -889,6 +878,7 @@ libraries['usb'] = LibraryInfo () prep_libcheck(env, libraries['usb']) @@ -58,7 +58,7 @@ conf = Configure (libraries['usb']) if conf.CheckLib ('usb', 'usb_interrupt_write'): -@@ -968,6 +958,7 @@ +@@ -961,6 +951,7 @@ if env['LIBLO']: libraries['lo'] = LibraryInfo () prep_libcheck(env, libraries['lo']) @@ -66,7 +66,7 @@ conf = Configure (libraries['lo']) if conf.CheckLib ('lo', 'lo_server_new') == False: -@@ -981,6 +972,7 @@ +@@ -974,6 +965,7 @@ libraries['dmalloc'] = LibraryInfo () prep_libcheck(env, libraries['dmalloc']) @@ -74,7 +74,7 @@ # # look for the threaded version -@@ -1038,8 +1030,10 @@ +@@ -1031,8 +1023,10 @@ subst_dict['%MIDITAG%'] = "ardour" subst_dict['%MIDITYPE%'] = "coremidi" else: @@ -87,7 +87,16 @@ env = conf.Finish() -@@ -1328,8 +1322,8 @@ +@@ -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: -- cgit