* [bug#64374] [PATCH] gnu: ardour: Update to 7.5.
@ 2023-06-30 19:59 Sughosha via Guix-patches via
2023-07-03 20:52 ` [bug#64374] [PATCH v2 1/3] " Sughosha via Guix-patches via
0 siblings, 1 reply; 5+ messages in thread
From: Sughosha via Guix-patches via @ 2023-06-30 19:59 UTC (permalink / raw)
To: 64374; +Cc: Sughosha
* 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#64374] [PATCH v2 1/3] gnu: ardour: Update to 7.5.
2023-06-30 19:59 [bug#64374] [PATCH] gnu: ardour: Update to 7.5 Sughosha via Guix-patches via
@ 2023-07-03 20:52 ` Sughosha via Guix-patches via
2023-07-03 20:52 ` [bug#64374] [PATCH v2 2/3] gnu: ardour: Install bundled MIDI loops Sughosha via Guix-patches via
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Sughosha via Guix-patches via @ 2023-07-03 20:52 UTC (permalink / raw)
To: 64374; +Cc: Sughosha
* 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#64374] [PATCH v2 2/3] gnu: ardour: Install bundled MIDI loops.
2023-07-03 20:52 ` [bug#64374] [PATCH v2 1/3] " Sughosha via Guix-patches via
@ 2023-07-03 20:52 ` Sughosha via Guix-patches via
2023-07-03 20:52 ` [bug#64374] [PATCH v2 3/3] gnu: ardour: Move ardour-rpath-phase inside this definition Sughosha via Guix-patches via
2023-07-18 12:27 ` bug#64374: [PATCH] gnu: ardour: Update to 7.5 宋文武 via Guix-patches via
2 siblings, 0 replies; 5+ messages in thread
From: Sughosha via Guix-patches via @ 2023-07-03 20:52 UTC (permalink / raw)
To: 64374; +Cc: Sughosha
* 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#64374] [PATCH v2 3/3] gnu: ardour: Move ardour-rpath-phase inside this definition.
2023-07-03 20:52 ` [bug#64374] [PATCH v2 1/3] " Sughosha via Guix-patches via
2023-07-03 20:52 ` [bug#64374] [PATCH v2 2/3] gnu: ardour: Install bundled MIDI loops Sughosha via Guix-patches via
@ 2023-07-03 20:52 ` Sughosha via Guix-patches via
2023-07-18 12:27 ` bug#64374: [PATCH] gnu: ardour: Update to 7.5 宋文武 via Guix-patches via
2 siblings, 0 replies; 5+ messages in thread
From: Sughosha via Guix-patches via @ 2023-07-03 20:52 UTC (permalink / raw)
To: 64374; +Cc: Sughosha
* 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#64374: [PATCH] gnu: ardour: Update to 7.5.
2023-07-03 20:52 ` [bug#64374] [PATCH v2 1/3] " Sughosha via Guix-patches via
2023-07-03 20:52 ` [bug#64374] [PATCH v2 2/3] gnu: ardour: Install bundled MIDI loops Sughosha via Guix-patches via
2023-07-03 20:52 ` [bug#64374] [PATCH v2 3/3] gnu: ardour: Move ardour-rpath-phase inside this definition Sughosha via Guix-patches via
@ 2023-07-18 12:27 ` 宋文武 via Guix-patches via
2 siblings, 0 replies; 5+ messages in thread
From: 宋文武 via Guix-patches via @ 2023-07-18 12:27 UTC (permalink / raw)
To: Sughosha; +Cc: 64374-done
Sughosha <sughosha@disroot.org> writes:
> * gnu/packages/audio.scm (ardour): Update to 7.5.
Pushed to master, thank you!
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-07-18 12:29 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-30 19:59 [bug#64374] [PATCH] gnu: ardour: Update to 7.5 Sughosha via Guix-patches via
2023-07-03 20:52 ` [bug#64374] [PATCH v2 1/3] " Sughosha via Guix-patches via
2023-07-03 20:52 ` [bug#64374] [PATCH v2 2/3] gnu: ardour: Install bundled MIDI loops Sughosha via Guix-patches via
2023-07-03 20:52 ` [bug#64374] [PATCH v2 3/3] gnu: ardour: Move ardour-rpath-phase inside this definition Sughosha via Guix-patches via
2023-07-18 12:27 ` bug#64374: [PATCH] gnu: ardour: Update to 7.5 宋文武 via Guix-patches via
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).