From 57f19959a7bc7e7283a5a5727340656d350f818b Mon Sep 17 00:00:00 2001 From: Dmitry Sharshakov Date: Wed, 9 Nov 2022 19:47:42 +0300 Subject: [PATCH] meson: drop unnecessary option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Barnabás Pőcze --- meson_options.txt | 2 -- spa/meson.build | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index 179d019c8..99b057c52 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -168,8 +168,6 @@ option('libcamera', description: 'Enable libcamera spa plugin integration', type: 'feature', value: 'auto') -option('system-libcamera', type : 'boolean', value : 'true', - description : 'Use libcamera from the system instead of building from source') option('videoconvert', description: 'Enable videoconvert spa plugin integration', type: 'feature', diff --git a/spa/meson.build b/spa/meson.build index 2dbff49a8..f88b5f9a3 100644 --- a/spa/meson.build +++ b/spa/meson.build @@ -89,12 +89,7 @@ if get_option('spa-plugins').allowed() vulkan_headers = cc.has_header('vulkan/vulkan.h', dependencies : vulkan_dep) #summary({'Vulkan': vulkan_headers}, bool_yn: true, section: 'Misc dependencies') - if get_option('system-libcamera') - libcamera_dep = dependency('libcamera', required: get_option('libcamera')) - else - libcamera_proj = subproject('libcamera') - libcamera_dep = libcamera_proj.get_variable('libcamera_public') - endif + libcamera_dep = dependency('libcamera', required: get_option('libcamera')) summary({'libcamera': libcamera_dep.found()}, bool_yn: true, section: 'Backend') tinycompress_dep = cc.find_library('tinycompress', has_headers: ['tinycompress/tinycompress.h' ], required: get_option('compress-offload'))