From: Ricardo Wurmus <rekado@elephly.net>
To: guix-devel@gnu.org
Subject: [PATCH] gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host.
Date: Sat, 26 Nov 2016 00:28:36 +0100 [thread overview]
Message-ID: <20161125232836.13621-2-rekado@elephly.net> (raw)
In-Reply-To: <20161125232836.13621-1-rekado@elephly.net>
* gnu/packages/algebra.scm (fftw-with-threads, fftwf-with-threads): New
variables.
* gnu/packages/audio.scm (ardour)[inputs]: Replace "fftw" and "fftwf"
with "fftw-with-threads" and "fftwf-with-threads", respectively.
* gnu/packages/music.scm (mod-host)[inputs]: Likewise.
---
gnu/packages/algebra.scm | 16 ++++++++++++++++
gnu/packages/audio.scm | 4 ++--
gnu/packages/music.scm | 4 ++--
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 76f385e..4288913 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -576,6 +576,22 @@ cosine/ sine transforms or DCT/DST).")
(string-append (package-description fftw)
" Single-precision version."))))
+;; FIXME: These packages are used temporarily by packages like Ardour until
+;; "--enable-flags" is added to the fftw and fftwf packages.
+(define-public fftw-with-threads
+ (package (inherit fftw)
+ (arguments
+ (substitute-keyword-arguments (package-arguments fftw)
+ ((#:configure-flags flags)
+ `(cons "--enable-threads" ,flags))))))
+
+(define-public fftwf-with-threads
+ (package (inherit fftwf)
+ (arguments
+ (substitute-keyword-arguments (package-arguments fftwf)
+ ((#:configure-flags flags)
+ `(cons "--enable-threads" ,flags))))))
+
(define-public fftw-openmpi
(package (inherit fftw)
(name "fftw-openmpi")
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index b535448..66db4c5 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -238,8 +238,8 @@ namespace ARDOUR { const char* revision = \"5.4\" ; }"))))
("lv2" ,lv2)
("vamp" ,vamp)
("curl" ,curl)
- ("fftw" ,fftw)
- ("fftwf" ,fftwf)
+ ("fftw" ,fftw-with-threads)
+ ("fftwf" ,fftwf-with-threads)
("jack" ,jack-1)
("serd" ,serd)
("sord" ,sord)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 999b0f6..3a3c308 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1817,8 +1817,8 @@ depend on it to run.")
#t)))))
(inputs
`(("lilv" ,lilv)
- ("fftw" ,fftw)
- ("fftwf" ,fftwf)
+ ("fftw" ,fftw-with-threads)
+ ("fftwf" ,fftwf-with-threads)
("lv2" ,lv2)
("jack" ,jack-1)
("readline" ,readline)))
--
2.10.2
next prev parent reply other threads:[~2016-11-25 23:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-25 23:28 [PATCH] Fix Ardour and mod-host Ricardo Wurmus
2016-11-25 23:28 ` Ricardo Wurmus [this message]
2016-11-26 6:14 ` [PATCH] gnu: Add threaded variants of fftw and fftwf for " Leo Famulari
2016-11-26 8:40 ` Ricardo Wurmus
2016-11-27 10:47 ` Ricardo Wurmus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161125232836.13621-2-rekado@elephly.net \
--to=rekado@elephly.net \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.