nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: ALSA: Update to 1.1.7. 

* gnu/packages/linux.scm (alsa-lib), alsa-utils): Update to 1.1.7.
(alsa-plugins): Likewise.
[arguments]: Add #:configure-flags.  Prevent default configuration from being
installed.  Don't copy the example PulseAudio configuration to pulseaudio output.
This commit is contained in:
Marius Bakke 2018-12-04 16:42:26 +01:00
parent 56a88478b9
commit 10b96d2955
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gnu/packages/linux.scm
View File

@ -993,7 +993,7 @@ intercept and print the system calls executed by the program.")
(define-public alsa-lib (define-public alsa-lib
(package (package
(name "alsa-lib") (name "alsa-lib")
(version "1.1.6") (version "1.1.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1001,7 +1001,7 @@ intercept and print the system calls executed by the program.")
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"096pwrnhj36yndldvs2pj4r871zhcgisks0is78f1jkjn9sd4b2z")))) "02fw7dw202mjid49w9ki3dsfcyvid5fj488561bdzcm3haw00q4x"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://www.alsa-project.org/") (home-page "https://www.alsa-project.org/")
(synopsis "The Advanced Linux Sound Architecture libraries") (synopsis "The Advanced Linux Sound Architecture libraries")
@ -1013,14 +1013,14 @@ MIDI functionality to the Linux-based operating system.")
(define-public alsa-utils (define-public alsa-utils
(package (package
(name "alsa-utils") (name "alsa-utils")
(version "1.1.6") (version "1.1.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "ftp://ftp.alsa-project.org/pub/utils/" (uri (string-append "ftp://ftp.alsa-project.org/pub/utils/"
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0vnkyymgwj9rfdb11nvab30dnfrylmakdfildxl0y8mj836awp0m")))) "02jlw6a22j2rr7inggfgk2hzx3w0fjhvhs0dn1afpzdp9aspzchx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; XXX: Disable man page creation until we have DocBook. ;; XXX: Disable man page creation until we have DocBook.
@ -1060,14 +1060,14 @@ MIDI functionality to the Linux-based operating system.")
(define-public alsa-plugins (define-public alsa-plugins
(package (package
(name "alsa-plugins") (name "alsa-plugins")
(version "1.1.6") (version "1.1.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "ftp://ftp.alsa-project.org/pub/plugins/" (uri (string-append "ftp://ftp.alsa-project.org/pub/plugins/"
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"04qcwkisbh0d6lnh0rw1k6n869fbs6zbfq6yvb41rymiwgmk27bg")))) "0iys4zl1davzyg3mn9lvil1n3k1ifrg3v1caj3k4dqyrnrd40jx7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; TODO: Split libavcodec and speex if possible. It looks like they can not ;; TODO: Split libavcodec and speex if possible. It looks like they can not
;; be split, there are references to both in files. ;; be split, there are references to both in files.
@ -1076,7 +1076,12 @@ MIDI functionality to the Linux-based operating system.")
;; obsolete. ;; obsolete.
(outputs '("out" "pulseaudio" "jack")) (outputs '("out" "pulseaudio" "jack"))
(arguments (arguments
`(#:phases `(#:configure-flags '(;; Do not install a "local" configuration targeted
;; for /etc/alsa. On GuixSD plugins are loaded from
;; the ALSA service, and other distributions likely
;; won't use these files.
"--with-alsalconfdir=/tmp/noop")
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'install 'split (add-after 'install 'split
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -1085,27 +1090,17 @@ MIDI functionality to the Linux-based operating system.")
(jack (assoc-ref outputs "jack")) (jack (assoc-ref outputs "jack"))
(jacklib (string-append jack "/lib/alsa-lib")) (jacklib (string-append jack "/lib/alsa-lib"))
(pua (assoc-ref outputs "pulseaudio")) (pua (assoc-ref outputs "pulseaudio"))
(pualib (string-append pua "/lib/alsa-lib")) (pualib (string-append pua "/lib/alsa-lib")))
(puaconf (string-append pua "/share/alsa/alsa.conf.d")))
;; For jack. ;; For jack.
(mkdir-p jacklib) (mkdir-p jacklib)
(for-each (lambda (file) (for-each (lambda (file)
(rename-file file (string-append jacklib "/" (basename file)))) (rename-file file (string-append jacklib "/" (basename file))))
(find-files out ".*jack\\.(la|so)")) (find-files out ".*jack\\.(la|so)"))
;; For pluseaudio. ;; For pulseaudio.
(mkdir-p puaconf)
(mkdir-p pualib) (mkdir-p pualib)
(chdir (string-append out "/share"))
(for-each (lambda (file)
(rename-file file (string-append puaconf "/" (basename file))))
(find-files out "\\.(conf|example)"))
(for-each (lambda (file) (for-each (lambda (file)
(rename-file file (string-append pualib "/" (basename file)))) (rename-file file (string-append pualib "/" (basename file))))
(find-files out ".*pulse\\.(la|so)")) (find-files out ".*pulse\\.(la|so)"))
(chdir "..")
;; We have moved the files to output pulsaudio, the
;; directory is now empty.
(delete-file-recursively (string-append out "/share"))
#t)))))) #t))))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)