From d06a2e21405cb6f49d61a4d2a8fec33f7c09ae25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Sun, 27 Jun 2021 15:40:02 +0200 Subject: [PATCH] spa: meson.build: look for libcamera under another name libcamera commit ec7afef665a87eb389a5a4cb9ff35e9c24bbcc29 (2021-06-24) changed the name of the generated pkg-config file from 'camera.pc' to 'libcamera.pc'. First look for the libcamera dependency under the new name 'libcamera', and if that's not found, look for it under the older name 'camera'. Fixes #1355 --- spa/meson.build | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/spa/meson.build b/spa/meson.build index 91308d2de..e13802e94 100644 --- a/spa/meson.build +++ b/spa/meson.build @@ -39,7 +39,15 @@ if not get_option('spa-plugins').disabled() vulkan_dep = dependency('vulkan', disabler : true, version : '>= 1.1.69', required: get_option('vulkan')) vulkan_headers = cc.has_header('vulkan/vulkan.h', dependencies : vulkan_dep) #summary({'Vulkan': vulkan_headers}, bool_yn: true, section: 'Misc dependencies') - libcamera_dep = dependency('camera', required: get_option('libcamera')) + + if not get_option('libcamera').disabled() + libcamera_dep = dependency('libcamera', required: false) + if not libcamera_dep.found() + libcamera_dep = dependency('camera', required: get_option('libcamera')) + endif + else + libcamera_dep = dependency('', required: false) + endif summary({'libcamera': libcamera_dep.found()}, bool_yn: true, section: 'Backend') # common dependencies