From 92a259470c67abe794bc7972c8f737138ebe8df2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Tue, 28 Dec 2021 16:13:58 +0100 Subject: [PATCH] spa: meson.build: only look for libcamera under one name Commit d06a2e21405cb6f49d61a4d2a8fec33f7c09ae25 added support for finding libcamera under two different names. However, due to breaking changes in libcamera[1], the current codebase only supports the latest version, thus drop support for the old name. [1]: see commit 57dae3e2b3f7d61fd15f763bbd9b862472022379 --- spa/meson.build | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/spa/meson.build b/spa/meson.build index 8d3d200fb..db99a1bd2 100644 --- a/spa/meson.build +++ b/spa/meson.build @@ -58,14 +58,7 @@ if not get_option('spa-plugins').disabled() vulkan_headers = cc.has_header('vulkan/vulkan.h', dependencies : vulkan_dep) #summary({'Vulkan': vulkan_headers}, bool_yn: true, section: 'Misc dependencies') - 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 + libcamera_dep = dependency('libcamera', required: get_option('libcamera')) summary({'libcamera': libcamera_dep.found()}, bool_yn: true, section: 'Backend') # common dependencies