From 2288778dd794507c3d18524496340b2e29008221 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Tue, 21 Dec 2021 04:02:17 +0000
Subject: [PATCH] ci: update for wlroots 0.15.0

---
 .github/workflows/ci_build.yml | 61 ++++++++++++++++++++--------------
 deps/zig-wlroots               |  2 +-
 2 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
index 30e810e..a24888a 100644
--- a/.github/workflows/ci_build.yml
+++ b/.github/workflows/ci_build.yml
@@ -1,6 +1,3 @@
-# Build river and run the test suite every time a commit is pushed to master or
-# a pull request is opened against master.
-
 on:
   push:
     branches:
@@ -9,7 +6,7 @@ on:
     branches:
       - master
 
-name: voidlinux
+name: voidlinux glibc
 
 jobs:
   default_build:
@@ -22,18 +19,26 @@ jobs:
         run: |
           xbps-install -Sy xbps
           xbps-install -uy
-          # wlroots dependencies as well as we build from source
+          # wayland/wlroots dependencies as well as we build from source
           xbps-install -y MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel \
-            libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols \
-            xcb-util-errors-devel xcb-util-wm-devel xcb-util-renderutil-devel libxcb-devel \
-            xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \
-            xcb-util-xrm-devel xorg-server-xwayland pkg-config meson git gcc \
-            zig pkgconf scdoc
+            libinput-devel libxkbcommon-devel pixman-devel expat-devel libxml2-devel \
+            libffi-devel wayland-protocols xcb-util-errors-devel xcb-util-wm-devel \
+            xcb-util-renderutil-devel libxcb-devel xcb-util-cursor-devel xcb-util-devel \
+            xcb-util-image-devel xcb-util-keysyms-devel xcb-util-xrm-devel \
+            xorg-server-xwayland pkg-config meson git gcc zig pkgconf scdoc
 
-          git clone https://github.com/swaywm/wlroots.git
+          git clone https://gitlab.freedesktop.org/wayland/wayland.git
+          cd wayland
+          git checkout 1.20.0
+          meson build -Ddocumentation=false -Dtests=false --prefix /usr
+          ninja -C build install
+          cd ..
+
+          git clone https://gitlab.freedesktop.org/wlroots/wlroots.git
           cd wlroots
-          git checkout 0.14.0
-          meson build --auto-features=enabled -Dexamples=false -Dwerror=false -Db_ndebug=false
+          git checkout 0.15.0
+          meson build --auto-features=enabled -Drenderers=gles2 -Dexamples=false \
+            -Dwerror=false -Db_ndebug=false --prefix /usr
           ninja -C build install
       - name: checkout
         uses: actions/checkout@v2
@@ -58,18 +63,26 @@ jobs:
         run: |
           xbps-install -Sy xbps
           xbps-install -uy
-          # wlroots dependencies as well as we build from source
+          # wayland/wlroots dependencies as well as we build from source
           xbps-install -y MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel \
-            libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols \
-            xcb-util-errors-devel xcb-util-wm-devel xcb-util-renderutil-devel libxcb-devel \
-            xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \
-            xcb-util-xrm-devel xorg-server-xwayland pkg-config meson git gcc \
-            zig pkgconf scdoc
+            libinput-devel libxkbcommon-devel pixman-devel expat-devel libxml2-devel \
+            libffi-devel wayland-protocols xcb-util-errors-devel xcb-util-wm-devel \
+            xcb-util-renderutil-devel libxcb-devel xcb-util-cursor-devel xcb-util-devel \
+            xcb-util-image-devel xcb-util-keysyms-devel xcb-util-xrm-devel \
+            xorg-server-xwayland pkg-config meson git gcc zig pkgconf scdoc
 
-          git clone https://github.com/swaywm/wlroots.git
+          git clone https://gitlab.freedesktop.org/wayland/wayland.git
+          cd wayland
+          git checkout 1.20.0
+          meson build -Ddocumentation=false -Dtests=false --prefix /usr
+          ninja -C build install
+          cd ..
+
+          git clone https://gitlab.freedesktop.org/wlroots/wlroots.git
           cd wlroots
-          git checkout 0.14.0
-          meson build --auto-features=enabled -Dexamples=false -Dwerror=false -Db_ndebug=false
+          git checkout 0.15.0
+          meson build --auto-features=enabled -Drenderers=gles2 -Dexamples=false \
+            -Dwerror=false -Db_ndebug=false --prefix /usr
           ninja -C build install
       - name: checkout
         uses: actions/checkout@v2
@@ -92,8 +105,7 @@ jobs:
     steps:
       - name: install deps
         run: |
-          xbps-install -S
-          xbps-install -uy xbps
+          xbps-install -Sy xbps
           xbps-install -uy zig git
 
       - name: checkout
@@ -106,5 +118,4 @@ jobs:
           zig fmt --check river/
           zig fmt --check riverctl/
           zig fmt --check rivertile/
-          zig fmt --check example/
           zig fmt --check build.zig
diff --git a/deps/zig-wlroots b/deps/zig-wlroots
index 9e2fc0d..a813d6c 160000
--- a/deps/zig-wlroots
+++ b/deps/zig-wlroots
@@ -1 +1 @@
-Subproject commit 9e2fc0dd6dfbd47c56fe10e260255e13cc5f114d
+Subproject commit a813d6c1c7b88dea0ba3b0eb28fe92206ad82ea6