diff options
| author | Andreas Enge <andreas@enge.fr> | 2015-10-29 23:34:09 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2015-10-29 23:34:09 +0100 |
| commit | 6072523231655f09c05dd209a980c4f4b0527be9 (patch) | |
| tree | 24cb316bdd5bb1f8c79c5c91716fc890906f8f8c /gnu/packages | |
| parent | 53e85d0aa5accd427f25cedeedd32bfa451dcb5e (diff) | |
| download | gnu-guix-6072523231655f09c05dd209a980c4f4b0527be9.tar gnu-guix-6072523231655f09c05dd209a980c4f4b0527be9.tar.gz | |
gnu: Remove ardour-3.
* gnu/packages/audio.scm (ardour-3): Remove variable.
(ardour): Copy fields from the removed ardour-3 instead of inheriting
from it.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/audio.scm | 39 |
1 files changed, 4 insertions, 35 deletions
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index ca3be8e424..404a5d9d62 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -152,13 +152,11 @@ streams from live audio.") libdir "/vamp" "\"]")))) #t)) -(define-public ardour-3 +(define-public ardour (package (name "ardour") - (version "3.5.403") + (version "4.2") (source (origin - ;; The project only provides tarballs upon individual request - ;; (or after payment) so we take the code from git. (method git-fetch) (uri (git-reference (url "git://git.ardour.org/ardour/ardour.git") @@ -171,10 +169,10 @@ streams from live audio.") "libs/ardour/revision.cc" (lambda (port) (format port "#include \"ardour/revision.h\" -namespace ARDOUR { const char* revision = \"3.5-403-gec2cb31\" ; }")))) +namespace ARDOUR { const char* revision = \"4.2\" ; }")))) (sha256 (base32 - "01b0wxh0wlxjfz5j8gcwwqhxc6q2kn4njz2fcmzv9fr3xaya5dbp")) + "1j8zw0bvh16qwyy8qrqynpak9nghl9j3qhjjcdl7wh9raafjqc00")) (file-name (string-append name "-" version)))) (build-system waf-build-system) (arguments @@ -231,35 +229,6 @@ record, edit, mix and master audio and MIDI projects. It is targeted at audio engineers, musicians, soundtrack editors and composers.") (license license:gpl2+))) -(define-public ardour - (package (inherit ardour-3) - (name "ardour") - (version "4.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "git://git.ardour.org/ardour/ardour.git") - (commit version))) - (snippet - ;; Ardour expects this file to exist at build time. It can be - ;; created from a git checkout with: - ;; ./waf create_stored_revision - '(call-with-output-file - "libs/ardour/revision.cc" - (lambda (port) - (format port "#include \"ardour/revision.h\" -namespace ARDOUR { const char* revision = \"4.2\" ; }")))) - (sha256 - (base32 - "1j8zw0bvh16qwyy8qrqynpak9nghl9j3qhjjcdl7wh9raafjqc00")) - (file-name (string-append name "-" version)))) - (arguments - (substitute-keyword-arguments (package-arguments ardour-3) - ((#:phases phases) - `(modify-phases ,phases - (replace 'set-rpath-in-LDFLAGS - ,(ardour-rpath-phase (version-prefix version 1))))))))) - (define-public azr3 (package (name "azr3") |