diff options
author | Michel Dänzer <mdaenzer@redhat.com> | 2020-10-23 12:40:41 +0200 |
---|---|---|
committer | Olivier Fourdan <ofourdan@redhat.com> | 2022-01-18 12:09:52 +0100 |
commit | 0c2883109749faad2cf533989f2394b7cd8699d1 (patch) | |
tree | bd2c73f1d09316e34412dacc22012531b57436da /meson_options.txt | |
parent | 2240914312c030cfc172df49803f1b748f11c62b (diff) |
meson: Build Xwayland unconditionally
And simplify build_glamor logic, we don't need the separate
glamor_option variable anymore.
(cherry picked from commit fdc61c5a3cc2637a52928c8e2fd4d50118c7ffea)
(cherry picked from commit 274d54d1c3876fd8c5142f43cd9204c0de417e92)
Diffstat (limited to 'meson_options.txt')
-rw-r--r-- | meson_options.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meson_options.txt b/meson_options.txt index f16714e06..16c936c67 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,7 +1,5 @@ -option('xwayland', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', - description: 'Enable Xwayland X server') -option('glamor', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', - description: 'Enable glamor (default yes for Xwayland builds)') +option('glamor', type: 'boolean', value: true, + description: 'Enable glamor (default yes)') option('xwayland_eglstream', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Enable EGLStream support for glamor on Xwayland') option('xvfb', type: 'boolean', value: true, |