diff options
Diffstat (limited to 'gnu/packages/pulseaudio.scm')
| -rw-r--r-- | gnu/packages/pulseaudio.scm | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 060a0613ec..66370a2dfb 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,9 @@ #: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 documentation) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) @@ -99,10 +102,11 @@ (("^/usr/bin/env") "env")) #t)))) (build-system gnu-build-system) - (inputs - `(("libvorbis" ,libvorbis) + (propagated-inputs + `(("flac" ,flac) ("libogg" ,libogg) - ("flac" ,flac))) + ("libvorbis" ,libvorbis) + ("opus" ,opus))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) @@ -191,7 +195,7 @@ rates.") (define-public pulseaudio (package (name "pulseaudio") - (version "14.0") + (version "15.0") (source (origin (method url-fetch) (uri (string-append @@ -199,7 +203,7 @@ rates.") name "-" version ".tar.xz")) (sha256 (base32 - "0qf20rgg0ysrnvg3359j56ndls07qmfn5rsy9r85bc42jdfpfd58")) + "1851rg4h6sjwanvd294hn52z321rc6vbs4gbfrlw53597dx8h2x4")) (modules '((guix build utils))) (snippet ;; Disable console-kit support by default since it's deprecated @@ -212,14 +216,19 @@ 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=disabled" + "-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 _ @@ -231,7 +240,6 @@ rates.") (setenv "CK_DEFAULT_TIMEOUT" "120") #t))))) (inputs - ;; TODO: Add optional inputs (GTK+?). `(("alsa-lib" ,alsa-lib) ("bluez" ,bluez) ("sbc" ,sbc) @@ -243,6 +251,7 @@ rates.") ("libltdl" ,libltdl) ("fftwf" ,fftwf) ("avahi" ,avahi) + ("webrtc-audio-processing", webrtc-audio-processing) ;; For the optional X11 modules. ("libice" ,libice) @@ -250,9 +259,11 @@ rates.") ("libxcb" ,libxcb) ("libxtst" ,libxtst) + ("elogind" ,elogind) ("eudev" ,eudev))) ;for the detection of hardware audio devices (native-inputs `(("check" ,check) + ("doxygen" ,doxygen) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("m4" ,m4) @@ -260,9 +271,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 @@ -294,7 +305,7 @@ sound server.") (build-system glib-or-gtk-build-system) (inputs `(("adwaita-icon-theme" ,adwaita-icon-theme) ;hard-coded theme - ("gtkmm" ,gtkmm) + ("gtkmm" ,gtkmm-3) ("json-glib" ,json-glib) ("libcanberra" ,libcanberra) ("pulseaudio" ,pulseaudio))) @@ -519,7 +530,7 @@ README.md for a detailed list of features.") `(("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config))) (inputs - `(("gtkmm" ,gtkmm) + `(("gtkmm" ,gtkmm-3) ("pulseaudio" ,pulseaudio))) (home-page "https://freedesktop.org/software/pulseaudio/paprefs/") (synopsis "Simple GTK based configuration dialog for the PulseAudio sound |