git.lucas.co / cce-compositor
Wayland compositor (wlroots)
git clone https://git.lucas.co/cce-compositor.git

commit494fcd0ec5025b0af28727ae527ff952e440a4b8
parent1e3406de63
authorIsaac Freund <[email protected]>
date2025-11-27 16:38
ci: fix build

 .builds/alpine.yml    | 12 ++----------
 .builds/archlinux.yml | 11 +----------
 .builds/freebsd.yml   | 14 ++++----------
 3 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/.builds/alpine.yml b/.builds/alpine.yml
index b2a8892..bd8af8c 100644
--- a/.builds/alpine.yml
+++ b/.builds/alpine.yml
@@ -14,6 +14,7 @@ packages:
   - xcb-util-wm-dev
   - pixman-dev
   - libevdev-dev
+  - wayland-dev
   - wayland-protocols
   - xwayland-dev
   - meson
@@ -23,18 +24,11 @@ packages:
   - xz
 sources:
   - https://codeberg.org/river/river
-  - https://gitlab.freedesktop.org/wayland/wayland.git
   - https://gitlab.freedesktop.org/wlroots/wlroots.git
 tasks:
   - install_deps: |
-      cd wayland
-      git checkout 1.23.0
-      meson setup build -Ddocumentation=false -Dtests=false --prefix /usr
-      sudo ninja -C build install
-      cd ..
-
       cd wlroots
-      git checkout 0.18.0
+      git checkout 0.19.0
       meson setup build --auto-features=enabled -Drenderers=gles2 \
             -Dcolor-management=disabled -Dlibliftoff=disabled \
             -Dexamples=false -Dwerror=false -Db_ndebug=false \
@@ -56,7 +50,5 @@ tasks:
   - fmt: |
       cd river
       zig fmt --check river/
-      zig fmt --check riverctl/
-      zig fmt --check rivertile/
       zig fmt --check build.zig
       zig fmt --check build.zig.zon
diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml
index a6c25ab..9772020 100644
--- a/.builds/archlinux.yml
+++ b/.builds/archlinux.yml
@@ -21,18 +21,11 @@ packages:
   - xz
 sources:
   - https://codeberg.org/river/river
-  - https://gitlab.freedesktop.org/wayland/wayland.git
   - https://gitlab.freedesktop.org/wlroots/wlroots.git
 tasks:
   - install_deps: |
-      cd wayland
-      git checkout 1.23.0
-      meson setup build -Ddocumentation=false -Dtests=false --prefix /usr
-      sudo ninja -C build install
-      cd ..
-
       cd wlroots
-      git checkout 0.18.0
+      git checkout 0.19.0
       meson setup build --auto-features=enabled -Drenderers=gles2 \
             -Dcolor-management=disabled -Dlibliftoff=disabled \
             -Dexamples=false -Dwerror=false -Db_ndebug=false \
@@ -54,7 +47,5 @@ tasks:
   - fmt: |
       cd river
       zig fmt --check river/
-      zig fmt --check riverctl/
-      zig fmt --check rivertile/
       zig fmt --check build.zig
       zig fmt --check build.zig.zon
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index d49fe20..fe933bf 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -7,6 +7,7 @@ packages:
   - devel/meson
   - devel/pkgconf
   - graphics/mesa-libs
+  - graphics/wayland
   - graphics/wayland-protocols
   - misc/hwdata
   - x11/libX11
@@ -26,19 +27,13 @@ packages:
   - wget
 sources:
   - https://codeberg.org/river/river
-  - https://gitlab.freedesktop.org/wayland/wayland.git
   - https://gitlab.freedesktop.org/wlroots/wlroots.git
 tasks:
   - install_deps: |
-      cd wayland
-      git checkout 1.23.0
-      meson setup build -Ddocumentation=false -Dtests=false --prefix /usr
-      sudo ninja -C build install
-      cd ..
-
       cd wlroots
-      git checkout 0.18.0
+      git checkout 0.19.0
       meson setup build --auto-features=enabled -Drenderers=gles2 \
+            -Dallocators=gbm \
             -Dcolor-management=disabled -Dlibliftoff=disabled \
             -Dexamples=false -Dwerror=false -Db_ndebug=false \
             -Dxcb-errors=disabled --prefix /usr
@@ -59,6 +54,5 @@ tasks:
   - fmt: |
       cd river
       zig fmt --check river/
-      zig fmt --check riverctl/
-      zig fmt --check rivertile/
       zig fmt --check build.zig
+      zig fmt --check build.zig.zon