From 4442d4dc409a9361d22760f184b294ef0421c8da Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 9 Oct 2019 12:56:49 +0200
Subject: gnu: pulseaudio: Update to 13.0.

* gnu/packages/pulseaudio.scm (pulseaudio): Update to 13.0.
[arguments]: Remove obsolete phase.
---
 gnu/packages/pulseaudio.scm | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'gnu/packages/pulseaudio.scm')

diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm
index ff4049d707..9777da540e 100644
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@ -130,7 +130,7 @@ rates.")
 (define-public pulseaudio
   (package
     (name "pulseaudio")
-    (version "12.2")
+    (version "13.0")
     (source (origin
              (method url-fetch)
              (uri (string-append
@@ -138,7 +138,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 +160,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
-- 
cgit v1.2.3


From 531b63eba77e40ac65ed89bdba48f6174adf12d0 Mon Sep 17 00:00:00 2001
From: Diego Nicola Barbato <dnbarbato@posteo.de>
Date: Tue, 1 Oct 2019 11:31:42 +0200
Subject: gnu: pulseaudio: Add optional X11 inputs.

* gnu/packages/pulseaudio.scm (pulseaudio)[inputs]: Add libxcb, libice, libsm,
  and libxtst.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
---
 gnu/packages/pulseaudio.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/pulseaudio.scm')

diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm
index 9777da540e..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
@@ -182,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)
-- 
cgit v1.2.3