GNU bug report logs - #64374
[PATCH] gnu: ardour: Update to 7.5.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 64374 in the body.
You can then email your comments to 64374 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Sughosha <sughosha <at> disroot.org>
To: guix-patches <at> gnu.org
Cc: Sughosha <sughosha <at> disroot.org>
Subject: [PATCH] gnu: ardour: Update to 7.5.
Date: Fri, 30 Jun 2023 21:59:38 +0200

* gnu/packages/audio.scm (ardour): Update to 7.5.
---
 gnu/packages/audio.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 88dbbbc7a2..550f653420 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -738,7 +738,7 @@ (define (ardour-rpath-phase major-version)
 (define-public ardour
   (package
     (name "ardour")
-    (version "7.4")
+    (version "7.5")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -755,7 +755,7 @@ (define-public ardour
 namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \"\"; }")))))
               (sha256
                (base32
-                "0v66h9fghjyjinldw9yfhhlfi3my235x6n4dpxx432z35lka2h89"))
+                "18pgxnxfp0pqsy24cmf3hanr6vh0pnimsh48x5nfbflqy7ljsrkj"))
               (file-name (string-append name "-" version))))
     (build-system waf-build-system)
     (arguments

base-commit: a98126e604b666d08a4c9d838bf9c341acea7f17
-- 
2.40.1

Message #8 received at 64374 <at> debbugs.gnu.org (full text, mbox):

From: Sughosha <sughosha <at> disroot.org>
To: 64374 <at> debbugs.gnu.org
Cc: Sughosha <sughosha <at> disroot.org>
Subject: [PATCH v2 1/3] gnu: ardour: Update to 7.5.
Date: Mon,  3 Jul 2023 22:52:17 +0200

* gnu/packages/audio.scm (ardour): Update to 7.5.
---
 gnu/packages/audio.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 88dbbbc7a2..550f653420 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -738,7 +738,7 @@ (define (ardour-rpath-phase major-version)
 (define-public ardour
   (package
     (name "ardour")
-    (version "7.4")
+    (version "7.5")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -755,7 +755,7 @@ (define-public ardour
 namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \"\"; }")))))
               (sha256
                (base32
-                "0v66h9fghjyjinldw9yfhhlfi3my235x6n4dpxx432z35lka2h89"))
+                "18pgxnxfp0pqsy24cmf3hanr6vh0pnimsh48x5nfbflqy7ljsrkj"))
               (file-name (string-append name "-" version))))
     (build-system waf-build-system)
     (arguments

base-commit: a98126e604b666d08a4c9d838bf9c341acea7f17
-- 
2.40.1

Message #11 received at 64374 <at> debbugs.gnu.org (full text, mbox):

From: Sughosha <sughosha <at> disroot.org>
To: 64374 <at> debbugs.gnu.org
Cc: Sughosha <sughosha <at> disroot.org>
Subject: [PATCH v2 2/3] gnu: ardour: Install bundled MIDI loops.
Date: Mon,  3 Jul 2023 22:52:18 +0200

* gnu/packages/audio.scm (ardour)[#:phases]: Add install-bundled-media.
[native-inputs]: Add unzip.
[license]: Add cc0 and expat.
---
 gnu/packages/audio.scm | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 550f653420..25fa8acf33 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -735,6 +735,14 @@ (define (ardour-rpath-phase major-version)
                          libdir "/surfaces" ":"
                          libdir "/vamp" "\"]"))))))
 
+(define ardour-bundled-media
+  (origin
+    (method url-fetch)
+    (uri "http://stuff.ardour.org/loops/ArdourBundledMedia.zip")
+    (sha256
+     (base32
+      "0k135sm559yywfidrya7h5cddwqa2p2abhimrar2khydf43f03d0"))))
+
 (define-public ardour
   (package
     (name "ardour")
@@ -793,7 +801,14 @@ (define-public ardour
          (add-after 'install 'install-man-page
            (lambda* (#:key outputs #:allow-other-keys)
              (install-file "ardour.1" (string-append (assoc-ref outputs "out")
-                                                     "/share/man/man1")))))
+                                                     "/share/man/man1"))))
+         (add-after 'install 'install-bundled-media
+           (lambda* (#:key outputs #:allow-other-keys)
+             (invoke "unzip" "-d" (string-append (assoc-ref outputs "out")
+                                                 "/share/ardour"
+                                                 ,(version-major version)
+                                                 "/media/")
+                     ,ardour-bundled-media))))
        #:test-target "test"))
     (inputs
      (list alsa-lib
@@ -848,14 +863,17 @@ (define-public ardour
            gettext-minimal
            itstool
            perl
-           pkg-config))
+           pkg-config
+           unzip))
     (home-page "https://ardour.org")
     (synopsis "Digital audio workstation")
     (description
      "Ardour is a multi-channel digital audio workstation, allowing users to
 record, edit, mix and master audio and MIDI projects.  It is targeted at audio
 engineers, musicians, soundtrack editors and composers.")
-    (license license:gpl2+)))
+    (license (list license:gpl2+
+                   license:cc0 ;used by MIDI Beats
+                   license:expat)))) ;used by MIDI Chords and Progressions
 
 (define-public audacity
   (package
-- 
2.40.1

Message #14 received at 64374 <at> debbugs.gnu.org (full text, mbox):

From: Sughosha <sughosha <at> disroot.org>
To: 64374 <at> debbugs.gnu.org
Cc: Sughosha <sughosha <at> disroot.org>
Subject: [PATCH v2 3/3] gnu: ardour: Move ardour-rpath-phase inside this
 definition.
Date: Mon,  3 Jul 2023 22:52:19 +0200

* gnu/packages/audio.scm (ardour)[#:phases]: Move ardour-rpath-phase
inside this definition.
(ardour-rpath-phase): Delete variable.
---
 gnu/packages/audio.scm | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 25fa8acf33..b08827b133 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -720,21 +720,6 @@ (define-public qm-dsp
 purposes developed at Queen Mary, University of London.")
     (license license:gpl2+)))
 
-(define (ardour-rpath-phase major-version)
-  `(lambda* (#:key outputs #:allow-other-keys)
-     (let ((libdir (string-append (assoc-ref outputs "out")
-                                  "/lib/ardour" ,major-version)))
-       (substitute* "wscript"
-         (("linker_flags = \\[\\]")
-          (string-append "linker_flags = [\""
-                         "-Wl,-rpath="
-                         libdir ":"
-                         libdir "/backends" ":"
-                         libdir "/engines" ":"
-                         libdir "/panners" ":"
-                         libdir "/surfaces" ":"
-                         libdir "/vamp" "\"]"))))))
-
 (define ardour-bundled-media
   (origin
     (method url-fetch)
@@ -776,7 +761,20 @@ (define-public ardour
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'set-rpath-in-LDFLAGS
-          ,(ardour-rpath-phase (version-major version)))
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((libdir (string-append (assoc-ref outputs "out")
+                                          "/lib/ardour"
+                                          ,(version-major version))))
+               (substitute* "wscript"
+                 (("linker_flags = \\[\\]")
+                  (string-append "linker_flags = [\""
+                                 "-Wl,-rpath="
+                                 libdir ":"
+                                 libdir "/backends" ":"
+                                 libdir "/engines" ":"
+                                 libdir "/panners" ":"
+                                 libdir "/surfaces" ":"
+                                 libdir "/vamp" "\"]"))))))
          (add-after 'install 'install-freedesktop-files
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out   (assoc-ref outputs "out"))
-- 
2.40.1

Message #19 received at 64374-done <at> debbugs.gnu.org (full text, mbox):

From: 宋文武 <iyzsong <at> envs.net>
To: Sughosha <sughosha <at> disroot.org>
Cc: 64374-done <at> debbugs.gnu.org
Subject: Re: bug#64374: [PATCH] gnu: ardour: Update to 7.5.
Date: Tue, 18 Jul 2023 20:27:57 +0800

Sughosha <sughosha <at> disroot.org> writes:

> * gnu/packages/audio.scm (ardour): Update to 7.5.

Pushed to master, thank you!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.