From 0b47b47b6c5e4fb7c1748625934272ed4583ecdc Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 4 Jun 2020 10:41:28 +0200 Subject: [PATCH] libcamera: disable by default Until it is at least more comon available in distros. --- meson_options.txt | 2 +- spa/examples/meson.build | 11 +++++++---- src/examples/media-session/media-session.c | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index 6988c4f0e..96377046c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -95,7 +95,7 @@ option('v4l2', option('libcamera', description: 'Enable libcamera spa plugin integration', type: 'boolean', - value: true) + value: false) option('videoconvert', description: 'Enable videoconvert spa plugin integration', type: 'boolean', diff --git a/spa/examples/meson.build b/spa/examples/meson.build index e3c9b2afd..ba5615b3b 100644 --- a/spa/examples/meson.build +++ b/spa/examples/meson.build @@ -3,10 +3,13 @@ if sdl_dep.found() include_directories : [spa_inc ], dependencies : [dl_lib, sdl_dep, pthread_lib], install : false) - executable('local-libcamera', 'local-libcamera.c', - include_directories : [spa_inc ], - dependencies : [dl_lib, sdl_dep, pthread_lib, libcamera_dep], - install : false) + + if get_option('libcamera') and libcamera_dep.found() + executable('local-libcamera', 'local-libcamera.c', + include_directories : [spa_inc ], + dependencies : [dl_lib, sdl_dep, pthread_lib, libcamera_dep], + install : false) + endif endif executable('example-control', 'example-control.c', diff --git a/src/examples/media-session/media-session.c b/src/examples/media-session/media-session.c index 767305a59..7c7e22346 100644 --- a/src/examples/media-session/media-session.c +++ b/src/examples/media-session/media-session.c @@ -1716,7 +1716,7 @@ static void do_quit(void *data, int signal_number) pw_main_loop_quit(impl->loop); } -#define DEFAULT_ENABLED "alsa-pcm,alsa-seq,v4l2,libcamera,bluez5,metadata,suspend-node,policy-node" +#define DEFAULT_ENABLED "alsa-pcm,alsa-seq,v4l2,bluez5,metadata,suspend-node,policy-node" #define DEFAULT_DISABLED "" static const struct {