aboutsummaryrefslogtreecommitdiffstats
path: root/.builds
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2024-05-18 14:02:14 +0200
committerLibravatar Simon Zeni <simon@bl4ckb0ne.ca>2024-05-21 11:44:39 -0400
commit970415241497ceccfb013b6f8cb2395abee74e5c (patch)
tree4943b3c8e2794146f74e5f6871865c2231231f7a /.builds
parentsway/config/output.c: fix null deref on output config (diff)
downloadsway-970415241497ceccfb013b6f8cb2395abee74e5c.tar.gz
sway-970415241497ceccfb013b6f8cb2395abee74e5c.tar.zst
sway-970415241497ceccfb013b6f8cb2395abee74e5c.zip
build: drop xwayland option
Instead of having a build-time option to enable/disable xwayland support, just use the wlroots build config: enable xwayland in Sway if it was enabled when building wlroots. I don't see any use-case for disabling xwayland in Sway when enabled in wlroots: Sway doesn't pull in any additional dependency (just pulls in dependencies that wlroots already needs). We have a config command to disable xwayland at runtime anyways. This makes it so xwayland behaves the same way as other features such as libinput backend and session support. This also reduces the build matrix (less combinations of build options). I think we originally introduced the xwayland option when we didn't have a good way to figure out the wlroots build config from the Sway build system.
Diffstat (limited to '.builds')
-rw-r--r--.builds/alpine.yml7
1 files changed, 6 insertions, 1 deletions
diff --git a/.builds/alpine.yml b/.builds/alpine.yml
index 59df7737..055e5ffa 100644
--- a/.builds/alpine.yml
+++ b/.builds/alpine.yml
@@ -38,9 +38,14 @@ tasks:
38 cd sway 38 cd sway
39 ninja -C build 39 ninja -C build
40 - build-no-xwayland: | 40 - build-no-xwayland: |
41 cd sway 41 cd wlroots
42 meson configure build -Dxwayland=disabled 42 meson configure build -Dxwayland=disabled
43 ninja -C build 43 ninja -C build
44 sudo ninja -C build install
45
46 cd ../sway
47 meson configure build --clearcache
48 ninja -C build
44 - build-static: | 49 - build-static: |
45 cd sway 50 cd sway
46 mkdir subprojects 51 mkdir subprojects