aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/pulseaudio.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-12-04 20:12:41 +0100
committerMarius Bakke <mbakke@fastmail.com>2019-12-04 20:12:41 +0100
commit33b59c1a3edbb81735e8d4e977b107f3ba1c2f9f (patch)
tree79ee86a29266d0a32ec0d0aa790ee5904b1098b8 /gnu/packages/pulseaudio.scm
parent936aa05209402dd399869ffae188db5dd5f67d69 (diff)
parentd733a469d74f74734825f1ce777956fb4cac5534 (diff)
downloadguix-33b59c1a3edbb81735e8d4e977b107f3ba1c2f9f.tar
guix-33b59c1a3edbb81735e8d4e977b107f3ba1c2f9f.tar.gz
Merge branch 'staging'
Diffstat (limited to 'gnu/packages/pulseaudio.scm')
-rw-r--r--gnu/packages/pulseaudio.scm19
1 files changed, 11 insertions, 8 deletions
diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm
index ff4049d707..671dcd1563 100644
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@ -50,7 +50,8 @@
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages python-web)
#:use-module (gnu packages pkg-config)
- #:use-module (gnu packages xiph))
+ #:use-module (gnu packages xiph)
+ #:use-module (gnu packages xorg))
(define-public libsndfile
(package
@@ -130,7 +131,7 @@ rates.")
(define-public pulseaudio
(package
(name "pulseaudio")
- (version "12.2")
+ (version "13.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -138,7 +139,7 @@ rates.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0ma0p8iry7fil7qb4pm2nx2pm65kq9hk9xc4r5wkf14nqbzni5l0"))
+ "0mw0ybrqj7hvf8lqs5gjzip464hfnixw453lr0mqzlng3b5266wn"))
(modules '((guix build utils)))
(snippet
;; Disable console-kit support by default since it's deprecated
@@ -160,11 +161,6 @@ rates.")
(assoc-ref %outputs "out")
"/lib/udev/rules.d"))
#:phases (modify-phases %standard-phases
- (add-before 'configure 'fix-alsa-include
- (lambda _
- (substitute* '("configure" "src/modules/alsa/alsa-ucm.h")
- (("use-case\\.h") "alsa/use-case.h"))
- #t))
(add-before 'check 'pre-check
(lambda _
;; 'tests/lock-autospawn-test.c' wants to create a file
@@ -187,6 +183,13 @@ rates.")
("libltdl" ,libltdl)
("fftwf" ,fftwf)
("avahi" ,avahi)
+
+ ;; For the optional X11 modules.
+ ("libice" ,libice)
+ ("libsm" ,libsm)
+ ("libxcb" ,libxcb)
+ ("libxtst" ,libxtst)
+
("eudev" ,eudev))) ;for the detection of hardware audio devices
(native-inputs
`(("check" ,check)