me
/
guix
Archived
1
0
Fork 0
Code

gnu: pulseaudio: Update to 16.1 and use gexps. 

* gnu/packages/pulseaudio.scm (pulseaudio): Update to 16.1.
[source]: Delete trailing #t and extraneous 'begin'.
[arguments]: Use gexps.
[phases]: Delete trailing #t.
[native-inputs]: Delete input labels.
master
Maxim Cournoyer 2022-08-22 17:13:06 -04:00
parent 58c9cbc63b
commit 7693ee2dd0
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
gnu/packages/pulseaudio.scm
View File

@ -15,6 +15,7 @@
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -34,6 +35,7 @@
(define-module (gnu packages pulseaudio) (define-module (gnu packages pulseaudio)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module ((guix licenses) #:prefix l:) #:use-module ((guix licenses) #:prefix l:)
@ -178,57 +180,55 @@ rates.")
(define-public pulseaudio (define-public pulseaudio
(package (package
(name "pulseaudio") (name "pulseaudio")
(version "15.0") (version "16.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://freedesktop.org/software/pulseaudio/releases/" "https://freedesktop.org/software/pulseaudio/releases/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1851rg4h6sjwanvd294hn52z321rc6vbs4gbfrlw53597dx8h2x4")) "1r2aa0g7al9jhrrbrnih6i3bfznd73kkbafrbzwpjyflj7735vwf"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Disable console-kit support by default since it's deprecated ;; Disable console-kit support by default since it's deprecated
;; anyway. ;; anyway.
'(begin '(substitute* "src/daemon/default.pa.in"
(substitute* "src/daemon/default.pa.in" (("load-module module-console-kit" all)
(("load-module module-console-kit" all) (string-append "#" all "\n"))))
(string-append "#" all "\n"))) (patches (search-patches
#t)) "pulseaudio-fix-mult-test.patch"
(patches (search-patches "pulseaudio-longer-test-timeout.patch"))))
"pulseaudio-fix-mult-test.patch"
"pulseaudio-longer-test-timeout.patch"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags (list
(let ((out (assoc-ref %outputs "out"))) #:configure-flags
(list "-Doss-output=disabled" #~(list "-Doss-output=disabled"
"-Dlocalstatedir=/var" "-Dlocalstatedir=/var"
(string-append "-Dudevrulesdir=" (string-append "-Dudevrulesdir="
out "/lib/udev/rules.d") #$output "/lib/udev/rules.d")
;; Ensure the RUNPATH contains all installed library locations. ;; Ensure the RUNPATH contains all installed library locations.
(string-append "-Dc_link_args=-Wl,-rpath=" (string-append "-Dc_link_args=-Wl,-rpath="
out "/lib/pulseaudio:" #$output "/lib/pulseaudio:"
out "/lib:" #$output "/lib:"
out "/lib/pulse-" ,version "/modules"))) #$output "/lib/pulse-" #$version "/modules"))
#:phases (modify-phases %standard-phases #:phases
(add-before 'check 'pre-check #~(modify-phases %standard-phases
(lambda _ (add-before 'check 'pre-check
;; 'tests/lock-autospawn-test.c' wants to create a file (lambda _
;; under ~/.config/pulse. ;; 'tests/lock-autospawn-test.c' wants to create a file
(setenv "HOME" (getcwd)) ;; under ~/.config/pulse.
;; 'thread-test' needs more time on hydra and on slower (setenv "HOME" (getcwd))
;; machines, so we set the default timeout to 120 seconds. ;; 'thread-test' needs more time on hydra and on slower
(setenv "CK_DEFAULT_TIMEOUT" "120") ;; machines, so we set the default timeout to 120 seconds.
#t))))) (setenv "CK_DEFAULT_TIMEOUT" "120"))))))
(inputs (inputs
(list alsa-lib (list alsa-lib
bluez bluez
sbc sbc
speexdsp speexdsp
libsndfile libsndfile
jack-1 ; For routing the output to jack. jack-1 ; For routing the output to jack.
dbus dbus
glib glib
libltdl libltdl
@ -241,16 +241,16 @@ rates.")
libxcb libxcb
libxtst libxtst
elogind elogind
eudev)) ;for the detection of hardware audio devices eudev)) ;for the detection of hardware audio devices
(native-inputs (native-inputs
`(("check" ,check) (list check
("doxygen" ,doxygen) doxygen
("gettext" ,gettext-minimal) gettext-minimal
("glib:bin" ,glib "bin") `(,glib "bin")
("m4" ,m4) m4
("perl" ,perl) perl
("perl-xml-parser" ,perl-xml-parser) perl-xml-parser
("pkg-config" ,pkg-config))) pkg-config))
(propagated-inputs (propagated-inputs
;; 'libpulse*.la' contain `-ltdb' and `-lcap', so propagate them. ;; 'libpulse*.la' contain `-ltdb' and `-lcap', so propagate them.
(list libcap tdb)) (list libcap tdb))