diff options
| author | Treeve Jelbert | 2007-10-01 17:23:17 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2007-10-01 17:23:17 +0200 |
| commit | d3f4eec5d0709ca58c66a342e3b9dbe17cb44924 (patch) | |
| tree | ffea26bd8fd8564d0404ffd144e03cd38cb886a5 | |
| parent | f935329077818361100baa396115998c284b90d4 (diff) | |
| parent | 4f2453b3547bbf9485e62ca959c66e2ecc912318 (diff) | |
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
| -rwxr-xr-x | audio-creation/ardour2/CONFIGURE | 8 | ||||
| -rwxr-xr-x | audio-creation/ardour2/DEPENDS | 9 | ||||
| -rwxr-xr-x | audio-creation/ardour2/DETAILS | 4 | ||||
| -rw-r--r-- | audio-creation/ardour2/HISTORY | 6 |
4 files changed, 16 insertions, 11 deletions
diff --git a/audio-creation/ardour2/CONFIGURE b/audio-creation/ardour2/CONFIGURE index f09bd01022..4f44e1db7c 100755 --- a/audio-creation/ardour2/CONFIGURE +++ b/audio-creation/ardour2/CONFIGURE @@ -11,10 +11,4 @@ config_query_option ARDOUR2_SURFACES \ "Build support for control surfaces?" \ y \ "SURFACES=1" \ - "SURFACES=0" && - -config_query_option ARDOUR2_FFT_ANALYSIS \ - "Include FFT analysis window?" \ - n \ - "FFT_ANALYSIS=1" \ - "FFT_ANALYSIS=0" + "SURFACES=0" diff --git a/audio-creation/ardour2/DEPENDS b/audio-creation/ardour2/DEPENDS index ed35fdc444..23e6ace5c7 100755 --- a/audio-creation/ardour2/DEPENDS +++ b/audio-creation/ardour2/DEPENDS @@ -1,7 +1,6 @@ depends g++ && depends scons && depends python && -#depends gettext && depends pkgconfig && depends libtool && depends libxml2 && @@ -21,11 +20,17 @@ if [[ $ARDOUR2_SYSLIBS == 'SYSLIBS=1' ]] then depends libsigc++3 && depends gtkmm2 && - depends libgnomecanvasmm + depends libgnomecanvasmm && + depends soundtouch fi && depends JACK-DRIVER && +optional_depends fftw \ + "FFT_ANALYSIS=1" \ + "FFT_ANALYSIS=0" \ + "to include FFT analysis window" && + optional_depends libusb \ "TRANZPORT=1" \ "TRANZPORT=0" \ diff --git a/audio-creation/ardour2/DETAILS b/audio-creation/ardour2/DETAILS index 4234adfcc5..94fbce3218 100755 --- a/audio-creation/ardour2/DETAILS +++ b/audio-creation/ardour2/DETAILS @@ -1,6 +1,6 @@ SPELL=ardour2 - VERSION=2.0.5 - SOURCE_HASH=sha512:1ef28bccfeb89b779c120cedea482257fc52d426b037555dd57b31d07c49741ce79cf0cf410413eb95c252b5aa5699d936a376f95dd7de3a9a460ace3291c917 + VERSION=2.1 + SOURCE_HASH=sha512:fb9975616c4fecca19e33a40817d779000247811d15d2752993164c655327f0fedc700719fb91ce49c97c723f08421aaa521a9b8112831f937f5b68d7a504cd0 SOURCE=ardour-$VERSION.tar.bz2 SOURCE_DIRECTORY="$BUILD_DIRECTORY/ardour-$VERSION" SOURCE_URL[0]=http://ardour.org/files/releases/$SOURCE diff --git a/audio-creation/ardour2/HISTORY b/audio-creation/ardour2/HISTORY index 1e0eba30ec..eaa419cfed 100644 --- a/audio-creation/ardour2/HISTORY +++ b/audio-creation/ardour2/HISTORY @@ -1,2 +1,8 @@ +2007-10-01 Juuso Alasuutari <iuso@sourcemage.org> + * DETAILS: Updated to 2.1. + * CONFIGURE, DEPENDS: Moved FFT analysis window option from CONFIGURE + to DEPENDS as it depends on fftw. + * DEPENDS: Added depends soundtouch for when using system libraries. + 2007-08-29 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS, CONFIGURE, DEPENDS, BUILD, INSTALL: Created spell. |