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

libcamera: fix implicit dependency to libdrm

Browse source 
libcamera is depending on libdrm in libcamera_wrapper.cpp but it was
implicitely including the header drm_fourcc.h with libcamera
file pixel_format.h

With this patch, the libcamera plugin should explicitely depends on
libdrm as it needs DRM fourcc and should not depend on multiple
inclusion from libcamera.

Add a FourCC for Motion-JPEG compressed format. This is a temporary
addition until the format gets merged in the upstream kernel.
This commit is contained in:
Stéphane Cerveau 2020-06-09 18:50:06 +02:00 • committed by Wim Taymans
parent 2c8292bef0
commit e7cc0f69e3
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spa/plugins/libcamera/meson.build
View file

@ -4,9 +4,13 @@ libcamera_sources = ['libcamera.c',
'libcamera-source.c',
'libcamera_wrapper.cpp']
libdrm_dep = dependency('libdrm', version : '>= 2.4.98',
required : get_option('libcamera'))
if libdrm_dep.found()
libcameralib = shared_library('spa-libcamera',
libcamera_sources,
include_directories : [ spa_inc ],
dependencies : [ libudev_dep, libcamera_dep, pthread_lib ],
dependencies : [ libudev_dep, libcamera_dep, pthread_lib, libdrm_dep ],
install : true,
install_dir : join_paths(spa_plugindir, 'libcamera'))
endif