Created
October 2, 2018 14:16
-
-
Save saboya/d3aa42205952440b87b00242ca6670dd to your computer and use it in GitHub Desktop.
Making wacom support optional for gnome-settings-daemon
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 3440c9860a4fa40b47efbc8f90b3caea79f6a86d Mon Sep 17 00:00:00 2001 | |
From: Rodrigo Saboya <saboya@gmail.com> | |
Date: Tue, 2 Oct 2018 11:03:45 -0300 | |
Subject: [PATCH] Adding meson option for Wacom support. | |
--- | |
meson.build | 2 +- | |
meson_options.txt | 1 + | |
2 files changed, 2 insertions(+), 1 deletion(-) | |
diff --git a/meson.build b/meson.build | |
index 47cf3722..0eeeee52 100644 | |
--- a/meson.build | |
+++ b/meson.build | |
@@ -139,7 +139,7 @@ endif | |
config_h.set10('HAVE_WAYLAND', enable_wayland) | |
# wacom (disabled for s390/s390x and non Linux platforms) | |
-enable_wacom = host_is_linux_not_s390 | |
+enable_wacom = get_option('wacom') and host_is_linux_not_s390 | |
if enable_wacom | |
assert(enable_gudev, 'GUDev support is required for wacom support.') | |
libwacom_dep = dependency('libwacom', version: '>= 0.7') | |
diff --git a/meson_options.txt b/meson_options.txt | |
index 50bd1749..ee1dd7cf 100644 | |
--- a/meson_options.txt | |
+++ b/meson_options.txt | |
@@ -7,4 +7,5 @@ option('cups', type: 'boolean', value: true, description: 'build with CUPS suppo | |
option('network_manager', type: 'boolean', value: true, description: 'build with NetworkManager support (not optional on Linux platforms)') | |
option('rfkill', type: 'boolean', value: true, description: 'build with rfkill support (not optional on Linux platforms)') | |
option('smartcard', type: 'boolean', value: true, description: 'build with smartcard support') | |
+option('wacom', type: 'boolean', value: true, description: 'build with Wacom support') | |
option('wayland', type: 'boolean', value: true, description: 'build with Wayland support') | |
-- | |
2.16.4 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment