mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: libcamera: bump minimum supported version to 0.2.0

Browse source
This commit is contained in:
Barnabás Pőcze 2024-01-09 19:22:07 +01:00 • committed by Wim Taymans
parent fd33d2d3bb
commit 01cb3fa862
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
spa/meson.build
View file

@ -96,9 +96,8 @@ if get_option('spa-plugins').allowed()
endif endif
summary({'Vulkan': have_vulkan}, bool_yn: true, section: 'Misc dependencies') summary({'Vulkan': have_vulkan}, bool_yn: true, section: 'Misc dependencies')
libcamera_dep = dependency('libcamera', required: get_option('libcamera')) libcamera_dep = dependency('libcamera', version: '>= 0.2.0', required: get_option('libcamera'))
summary({'libcamera': libcamera_dep.found()}, bool_yn: true, section: 'Backend') summary({'libcamera': libcamera_dep.found()}, bool_yn: true, section: 'Backend')
cdata.set('HAVE_LIBCAMERA_SYSTEM_DEVICES', libcamera_dep.version().version_compare('>= 0.1.0'))
compress_offload_option = get_option('compress-offload') compress_offload_option = get_option('compress-offload')
summary({'Compress-Offload': compress_offload_option.allowed()}, bool_yn: true, section: 'Backend') summary({'Compress-Offload': compress_offload_option.allowed()}, bool_yn: true, section: 'Backend')

2
spa/plugins/libcamera/libcamera-device.cpp
View file

@ -61,12 +61,10 @@ struct impl {
static const libcamera::Span<const int64_t> cameraDevice( static const libcamera::Span<const int64_t> cameraDevice(
const Camera *camera) const Camera *camera)
{ {
#ifdef HAVE_LIBCAMERA_SYSTEM_DEVICES
const ControlList &props = camera->properties(); const ControlList &props = camera->properties();
if (auto devices = props.get(properties::SystemDevices)) if (auto devices = props.get(properties::SystemDevices))
return devices.value(); return devices.value();
#endif
return {}; return {};
} }