[sushi: 1/2] meson: make X11 and Wayland configurable
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [sushi: 1/2] meson: make X11 and Wayland configurable
- Date: Mon, 2 Dec 2019 00:27:55 +0000 (UTC)
commit 2e96071e68efba4296aef07a53b1067be39f8fbf
Author: David Heidelberg <david ixit cz>
Date: Mon Oct 28 01:36:46 2019 +0100
meson: make X11 and Wayland configurable
This helps distributions with packaging, while not impacting regular
users.
Signed-off-by: David Heidelberg <david ixit cz>
meson.build | 6 +++---
meson_options.txt | 8 ++++++++
2 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index 0d9fa89..e1c5940 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@ project(
'sushi',
'c',
version: '3.34.0',
- meson_version: '>=0.46.0'
+ meson_version: '>=0.47.0'
)
epoxy_dep = dependency('epoxy')
@@ -17,8 +17,8 @@ gstreamer_audio_dep = dependency('gstreamer-audio-1.0')
gstreamer_tag_dep = dependency('gstreamer-tag-1.0')
gstreamer_video_dep = dependency('gstreamer-video-1.0')
gtk_dep = dependency('gtk+-3.0', version: '>=3.13.2')
-gtk_x11_dep = dependency('gtk+-x11-3.0', required: false)
-gtk_wayland_dep = dependency('gtk+-wayland-3.0', version: '>= 3.21.5', required: false)
+gtk_x11_dep = dependency('gtk+-x11-3.0', required: get_option('X11'))
+gtk_wayland_dep = dependency('gtk+-wayland-3.0', version: '>= 3.21.5', required: get_option('wayland'))
gtksourceview_dep = dependency('gtksourceview-4', version: '>=4.0.3')
harfbuzz_dep = dependency('harfbuzz', version: '>=0.9.9')
musicbrainz_dep = dependency('libmusicbrainz5')
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 0000000..d2dff65
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1,8 @@
+option('wayland',
+ type: 'feature',
+ value: 'auto',
+ description: 'Build with Wayland support.')
+option('X11',
+ type: 'feature',
+ value: 'auto',
+ description: 'Build with legacy X11 support.')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]