From f47a7a8ea39ff7cda272e413531e5e475e164d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Tonn=C3=A4tt?= Date: Sat, 17 Apr 2021 20:44:18 +0200 Subject: [PATCH] Rearrange libudev dependency Make libudev dependency required if v4l2 feature option is set to enabled or auto, or if alsa dependency is found or enabled through pipewire-alsa or alsa. --- spa/meson.build | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spa/meson.build b/spa/meson.build index 6c207e89f..5e37611e1 100644 --- a/spa/meson.build +++ b/spa/meson.build @@ -16,9 +16,6 @@ if not get_option('spa-plugins').disabled() udevrulesdir = '/lib/udev/rules.d' endif - # common dependencies - libudev_dep = dependency('libudev', required: get_option('alsa').enabled() or get_option('v4l2').enabled() or get_option('udev').enabled()) - # plugin-specific dependencies alsa_dep = dependency('alsa', required: get_option('alsa')) bluez_dep = dependency('bluez', version : '>= 4.101', required: get_option('bluez5')) @@ -34,6 +31,11 @@ if not get_option('spa-plugins').disabled() vulkan_headers = cc.has_header('vulkan/vulkan.h', dependencies : vulkan_dep) libcamera_dep = dependency('camera', required: get_option('libcamera')) + # common dependencies + libudev_dep = dependency('libudev', required: alsa_dep.found()) + libudev_dep = dependency('libudev', required: get_option('udev')) + libudev_dep = dependency('libudev', required: get_option('v4l2')) + subdir('plugins') endif