From f22b7b22a8904e4727ad88e8005b11fbe161c7f5 Mon Sep 17 00:00:00 2001 From: Gleb Popov <6yearold@gmail.com> Date: Mon, 9 Mar 2020 23:08:05 +0400 Subject: [PATCH] Define alsa_dep a bit earlier and even in case the option is off to fix meson setup: src/examples/meson.build:47:12 uses alsa_dep unconditionally. --- meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 1150155da..a628887fe 100644 --- a/meson.build +++ b/meson.build @@ -226,6 +226,10 @@ epoll_shim_dep = (build_machine.system() == 'freebsd' ? dependency('epoll-shim', required: true) : dependency('', required: false)) +alsa_dep = (get_option('pipewire-alsa') + ? dependency('alsa') + : dependency('', required: false)) + subdir('spa') subdir('src') @@ -240,7 +244,6 @@ if get_option('pipewire-pulseaudio') endif if get_option('pipewire-alsa') - alsa_dep = dependency('alsa') subdir('pipewire-alsa/alsa-plugins') endif