diff options
| author | Brice Waegeneire <brice@waegenei.re> | 2021-02-05 09:00:29 +0100 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-11-11 10:31:15 -0500 |
| commit | f635b3cde790aa1fa65ebe828de8e6dd3fd0aaad (patch) | |
| tree | 0849208d51ec12be3f64cc93f7affda1fed9b711 /gnu/packages/pulseaudio.scm | |
| parent | 67760f9ec4d4cafe474a8338e92221b9581bba8b (diff) | |
| download | guix-patches-f635b3cde790aa1fa65ebe828de8e6dd3fd0aaad.tar guix-patches-f635b3cde790aa1fa65ebe828de8e6dd3fd0aaad.tar.gz | |
gnu: pulseaudio: Use meson build system.
* gnu/packages/pulseaudio.scm (pulseaudio)[build-system]: Switch from
gnu to meson.
[arguments]: Migrate configure flags for meson.
[propagated-inputs]: Replace 'gdbm' with 'tdb', upstream default.
Diffstat (limited to 'gnu/packages/pulseaudio.scm')
| -rw-r--r-- | gnu/packages/pulseaudio.scm | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 1557bdbeb5..be8e1d4211 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -50,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) @@ -214,14 +214,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 _ @@ -233,7 +239,6 @@ rates.") (setenv "CK_DEFAULT_TIMEOUT" "120") #t))))) (inputs - ;; TODO: Add optional inputs (GTK+?). `(("alsa-lib" ,alsa-lib) ("bluez" ,bluez) ("sbc" ,sbc) @@ -263,9 +268,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 |