diff options
| author | Brice Waegeneire <brice@waegenei.re> | 2021-02-05 09:00:29 +0100 |
|---|---|---|
| committer | Brice Waegeneire <brice@waegenei.re> | 2021-02-16 08:45:57 +0100 |
| commit | 0c25529c6c4d1da7483db3db8bdc4a10b580c85b (patch) | |
| tree | 1ed9b7f82036d5ce295d16a20125bc332622893a /gnu | |
| parent | 36c1372d649e7f4f7039c070394b5b2d55e630c3 (diff) | |
| download | guix-0c25529c6c4d1da7483db3db8bdc4a10b580c85b.tar.gz guix-0c25529c6c4d1da7483db3db8bdc4a10b580c85b.zip | |
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')
| -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 0589d86529..5ae30033e0 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) @@ -202,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 _ @@ -221,7 +227,6 @@ rates.") (setenv "CK_DEFAULT_TIMEOUT" "120") #t))))) (inputs - ;; TODO: Add optional inputs (GTK+?). `(("alsa-lib" ,alsa-lib) ("bluez" ,bluez) ("sbc" ,sbc) @@ -250,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 |