diff options
Diffstat (limited to 'gnu/packages/pulseaudio.scm')
-rw-r--r-- | gnu/packages/pulseaudio.scm | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index ea61dd807c..5ae30033e0 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org> +;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,7 +50,7 @@ #:use-module (gnu packages avahi) #:use-module (gnu packages boost) #:use-module (gnu packages check) - #:use-module (gnu packages dbm) + #:use-module (gnu packages databases) #:use-module (gnu packages glib) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) @@ -180,7 +181,7 @@ rates.") (define-public pulseaudio (package (name "pulseaudio") - (version "14.0") + (version "14.2") (source (origin (method url-fetch) (uri (string-append @@ -188,7 +189,7 @@ rates.") name "-" version ".tar.xz")) (sha256 (base32 - "0qf20rgg0ysrnvg3359j56ndls07qmfn5rsy9r85bc42jdfpfd58")) + "1wb6zyln49ca93rl9id8r873b2sb8l79122ck824kr0s5isgglvm")) (modules '((guix build utils))) (snippet ;; Disable console-kit support by default since it's deprecated @@ -201,14 +202,20 @@ rates.") (patches (search-patches "pulseaudio-fix-mult-test.patch" "pulseaudio-longer-test-timeout.patch")))) - (build-system gnu-build-system) + (build-system meson-build-system) (arguments - `(#:configure-flags (list "--localstatedir=/var" ;"--sysconfdir=/etc" - "--disable-oss-output" - "--enable-bluez5" - (string-append "--with-udev-rules-dir=" - (assoc-ref %outputs "out") - "/lib/udev/rules.d")) + `(#:configure-flags + (let ((out (assoc-ref %outputs "out"))) + (list "-Doss-output=disable" + "-Dbluez5=true" + "-Dlocalstatedir=/var" + (string-append "-Dudevrulesdir=" + out "/lib/udev/rules.d") + ;; Ensure the RUNPATH contains all installed library locations. + (string-append "-Dc_link_args=-Wl,-rpath=" + out "/lib/pulseaudio:" + out "/lib:" + out "/lib/pulse-" ,version "/modules"))) #:phases (modify-phases %standard-phases (add-before 'check 'pre-check (lambda _ @@ -220,7 +227,6 @@ rates.") (setenv "CK_DEFAULT_TIMEOUT" "120") #t))))) (inputs - ;; TODO: Add optional inputs (GTK+?). `(("alsa-lib" ,alsa-lib) ("bluez" ,bluez) ("sbc" ,sbc) @@ -249,9 +255,9 @@ rates.") ("perl-xml-parser" ,perl-xml-parser) ("pkg-config" ,pkg-config))) (propagated-inputs - ;; 'libpulse*.la' contain `-lgdbm' and `-lcap', so propagate them. + ;; 'libpulse*.la' contain `-ltdb' and `-lcap', so propagate them. `(("libcap" ,libcap) - ("gdbm" ,gdbm))) + ("tdb" ,tdb))) (home-page "http://www.pulseaudio.org/") (synopsis "Sound server") (description |