From 385c9ade5f7a8ce9e5c13f762d56e6bd1c8d1b0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= Date: Wed, 5 Jun 2024 22:33:05 -0600 Subject: [PATCH] add an option to enable/disable libliftoff instead of always using it if found --- backend/drm/meson.build | 2 +- meson.build | 1 + meson_options.txt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/drm/meson.build b/backend/drm/meson.build index 7c00b0f0..666c7cc4 100644 --- a/backend/drm/meson.build +++ b/backend/drm/meson.build @@ -16,7 +16,7 @@ libliftoff = dependency( 'libliftoff', version: '>=0.4.0', fallback: 'libliftoff', - required: false, + required: get_option('libliftoff'), ) if not (hwdata.found() and libdisplay_info.found() and features['session']) diff --git a/meson.build b/meson.build index 3e98b4fb..b0805b0c 100644 --- a/meson.build +++ b/meson.build @@ -99,6 +99,7 @@ features = { internal_features = { 'xcb-errors': false, 'egl': false, + 'libliftoff': false, } internal_config = configuration_data() diff --git a/meson_options.txt b/meson_options.txt index 0c9a1a8c..35961b10 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -8,3 +8,4 @@ option('allocators', type: 'array', choices: ['auto', 'gbm'], value: ['auto'], description: 'Select built-in allocators') option('session', type: 'feature', value: 'auto', description: 'Enable session support') option('color-management', type: 'feature', value: 'auto', description: 'Enable support for color management') +option('libliftoff', type: 'feature', value: 'auto', description: 'Enable support for libliftoff')