[PATCH 0/2] Fix failing build of cava

  • Done
  • quality assurance status badge
Details
2 participants
  • Daniel Meißner
  • Ludovic Courtès
Owner
unassigned
Submitted by
Daniel Meißner
Severity
normal
D
D
Daniel Meißner wrote on 12 Apr 2022 23:50
(address . guix-patches@gnu.org)(name . Daniel Meißner)(address . daniel.meissner-i4k@ruhr-uni-bochum.de)
20220412215012.15452-1-daniel.meissner-i4k@ruhr-uni-bochum.de
Hi Guix,

this patch series fixes the failing build¹ for cava and uses the newer
G-expressions for the arguments.


Daniel Meißner (2):
gnu: cava: Use G-expressions.
gnu: cava: Fix build failure

gnu/packages/audio.scm | 66 +++++++++++++++++++++++-------------------
1 file changed, 37 insertions(+), 29 deletions(-)

--
2.34.0
D
D
Daniel Meißner wrote on 12 Apr 2022 23:52
[PATCH 1/2] gnu: cava: Use G-expressions.
(address . 54895@debbugs.gnu.org)(name . Daniel Meißner)(address . daniel.meissner-i4k@ruhr-uni-bochum.de)
20220412215204.15514-1-daniel.meissner-i4k@ruhr-uni-bochum.de
* gnu/packages/audio.scm (cava)[arguments]: Use G-expressions.
---
gnu/packages/audio.scm | 55 +++++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 28 deletions(-)

Toggle diff (69 lines)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 13e0f02837..fd85b20855 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -4589,35 +4589,34 @@ (define-public cava
(base32
"1mziklmqifhnb4kg9ia2r56r8wjn6xp40bkpf484hsgqvnrccl86"))))
(build-system gnu-build-system)
- (native-inputs
- (list autoconf automake libtool))
- (inputs
- (list fftw ncurses pulseaudio))
+ (native-inputs (list autoconf automake libtool))
+ (inputs (list fftw ncurses pulseaudio))
(arguments
- `(#:configure-flags
- (list (string-append "PREFIX=" %output)
- (string-append "FONT_DIR=" %output "/share/consolefonts"))
- #:make-flags
- (let ((lib (string-append %output "/lib")))
- (list (string-append "cava_LDFLAGS = -L" lib " -Wl,-rpath " lib)))
- #:phases
- (modify-phases %standard-phases
- (replace 'bootstrap
- (lambda* (#:key outputs #:allow-other-keys)
- (setenv "HOME" (getcwd))
- (invoke "sh" "autogen.sh")))
- (add-before 'build 'make-cava-ldflags
- (lambda* (#:key outputs #:allow-other-keys)
- (mkdir-p (string-append (assoc-ref outputs "out") "/lib"))
- #t))
- (add-after 'install 'data
- (lambda* (#:key outputs #:allow-other-keys)
- (for-each (lambda (file)
- (install-file file
- (string-append (assoc-ref outputs "out")
- "/share/doc/examples")))
- (find-files "example_files"))
- #t)))))
+ (list #:configure-flags
+ #~(list (string-append "PREFIX="
+ #$output)
+ (string-append "FONT_DIR="
+ #$output "/share/consolefonts"))
+ #:make-flags
+ #~(let ((lib (string-append #$output "/lib")))
+ (list (string-append "cava_LDFLAGS = -L" lib " -Wl,-rpath " lib)))
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'bootstrap
+ (lambda _
+ (setenv "HOME"
+ (getcwd))
+ (invoke "sh" "autogen.sh")))
+ (add-before 'build 'make-cava-ldflags
+ (lambda _
+ (mkdir-p (string-append #$output "/lib"))))
+ (add-after 'install 'data
+ (lambda _
+ (for-each (lambda (file)
+ (install-file file
+ (string-append #$output
+ "/share/doc/examples")))
+ (find-files "example_files")))))))
(home-page "https://karlstav.github.io/cava/")
(synopsis "Console audio visualizer for ALSA, MPD, and PulseAudio")
(description "C.A.V.A. is a bar audio spectrum visualizer for the terminal
--
2.34.0
D
D
Daniel Meißner wrote on 12 Apr 2022 23:52
[PATCH 2/2] gnu: cava: Fix build failure
(address . 54895@debbugs.gnu.org)(name . Daniel Meißner)(address . daniel.meissner-i4k@ruhr-uni-bochum.de)
20220412215204.15514-2-daniel.meissner-i4k@ruhr-uni-bochum.de
* gnu/packages/audio.scm (cava)[source]: Remove bundled iniparser.
(cava)[inputs]: Add iniparser.
---
gnu/packages/audio.scm | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)

Toggle diff (44 lines)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index fd85b20855..9b7d723921 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -110,6 +110,7 @@ (define-module (gnu packages audio)
#:use-module (gnu packages qt)
#:use-module (gnu packages rdf)
#:use-module (gnu packages readline)
+ #:use-module (gnu packages samba)
#:use-module (gnu packages sdl)
#:use-module (gnu packages serialization)
#:use-module (gnu packages sqlite)
@@ -4587,10 +4588,18 @@ (define-public cava
(file-name (git-file-name name version))
(sha256
(base32
- "1mziklmqifhnb4kg9ia2r56r8wjn6xp40bkpf484hsgqvnrccl86"))))
+ "1mziklmqifhnb4kg9ia2r56r8wjn6xp40bkpf484hsgqvnrccl86"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ (delete-file-recursively "iniparser")
+ (substitute* "configure.ac"
+ (("AC_CONFIG_FILES\\(iniparser/Makefile\\)") ""))
+ (substitute* "Makefile.am"
+ (("SUBDIRS = iniparser") ""))))))
(build-system gnu-build-system)
(native-inputs (list autoconf automake libtool))
- (inputs (list fftw ncurses pulseaudio))
+ (inputs (list fftw ncurses pulseaudio iniparser))
(arguments
(list #:configure-flags
#~(list (string-append "PREFIX="
@@ -4599,7 +4608,7 @@ (define-public cava
#$output "/share/consolefonts"))
#:make-flags
#~(let ((lib (string-append #$output "/lib")))
- (list (string-append "cava_LDFLAGS = -L" lib " -Wl,-rpath " lib)))
+ (list (string-append "cava_LDFLAGS = -L" lib " -Wl,-rpath " lib " -lrt")))
#:phases
#~(modify-phases %standard-phases
(replace 'bootstrap
--
2.34.0
L
L
Ludovic Courtès wrote on 6 May 2022 10:31
Re: bug#54895: [PATCH 0/2] Fix failing build of cava
(name . Daniel Meißner)(address . daniel.meissner-i4k@ruhr-uni-bochum.de)(address . 54895-done@debbugs.gnu.org)
87k0az3vw5.fsf@gnu.org
Hi,

Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de> skribis:

Toggle quote (9 lines)
> this patch series fixes the failing build¹ for cava and uses the newer
> G-expressions for the arguments.
>
> ¹ https://ci.guix.gnu.org/build/620722/details
>
> Daniel Meißner (2):
> gnu: cava: Use G-expressions.
> gnu: cava: Fix build failure

Applied, thanks!

Ludo’.
Closed
?