3 files changed, 20 insertions, 5 deletions

diff --git a/.builds/alpine.yml b/.builds/alpine.yml
index 7f0bef02..055e5ffa 100644
--- a/.builds/alpine.yml
+++ b/.builds/alpine.yml
@@ -4,6 +4,7 @@ packages:
   - eudev-dev
   - gdk-pixbuf-dev
   - json-c-dev
+  - libdisplay-info-dev
   - libevdev-dev
   - libinput-dev
   - libseat-dev
@@ -12,16 +13,18 @@ packages:
   - mesa-dev
   - meson
   - pango-dev
+  - pcre2-dev
   - pixman-dev
   - scdoc
   - wayland-dev
   - wayland-protocols
   - xcb-util-image-dev
   - xcb-util-wm-dev
-  - xwayland
+  - xwayland-dev
+  - hwdata-dev
 sources:
   - https://github.com/swaywm/sway
-  - https://github.com/swaywm/wlroots
+  - https://gitlab.freedesktop.org/wlroots/wlroots.git
 tasks:
   - wlroots: |
       cd wlroots
@@ -35,9 +38,14 @@ tasks:
       cd sway
       ninja -C build
   - build-no-xwayland: |
-      cd sway
+      cd wlroots
       meson configure build -Dxwayland=disabled
       ninja -C build
+      sudo ninja -C build install
+
+      cd ../sway
+      meson configure build --clearcache
+      ninja -C build
   - build-static: |
       cd sway
       mkdir subprojects
diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml
index a8f1dfed..9972c01a 100644
--- a/.builds/archlinux.yml
+++ b/.builds/archlinux.yml
@@ -3,12 +3,14 @@ packages:
   - cairo
   - gdk-pixbuf2
   - json-c
+  - libdisplay-info
   - libegl
   - libinput
   - libxcb
   - libxkbcommon
   - meson
   - pango
+  - pcre2
   - scdoc
   - wayland
   - wayland-protocols
@@ -16,9 +18,10 @@ packages:
   - xcb-util-wm
   - xorg-xwayland
   - seatd
+  - hwdata
 sources:
   - https://github.com/swaywm/sway
-  - https://github.com/swaywm/wlroots
+  - https://gitlab.freedesktop.org/wlroots/wlroots.git
 tasks:
   - wlroots: |
       cd wlroots
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index 1a3c8512..29c6312a 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -4,6 +4,7 @@ packages:
 - devel/json-c
 - devel/libevdev
 - devel/meson
+- devel/pcre2
 - devel/pkgconf
 - graphics/cairo
 - graphics/gdk-pixbuf2
@@ -19,14 +20,17 @@ packages:
 - devel/libudev-devd
 - graphics/libdrm
 - graphics/mesa-libs
+- sysutils/libdisplay-info
 - sysutils/seatd
 - x11/libinput
 - x11/libX11
 - x11/pixman
 - x11/xcb-util-wm
+- x11-servers/xwayland-devel
+- misc/hwdata
 sources:
 - https://github.com/swaywm/sway
-- https://github.com/swaywm/wlroots
+- https://gitlab.freedesktop.org/wlroots/wlroots.git
 tasks:
 - setup: |
     cd sway