From e8e0049e9ae71eaeb86450bf7baf81bb52e80cb1 Mon Sep 17 00:00:00 2001 From: Tristan Daniel Date: Mon, 6 Jan 2020 20:21:14 +0100 Subject: [PATCH] meson: require wlroots 0.9.1 And update CI builds accordingly. --- .builds/alpine.yml | 2 +- .builds/archlinux.yml | 3 +-- .builds/freebsd.yml | 3 +-- meson.build | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.builds/alpine.yml b/.builds/alpine.yml index 5ed154d..ad5f045 100644 --- a/.builds/alpine.yml +++ b/.builds/alpine.yml @@ -17,7 +17,7 @@ tasks: # version, instead of master, to avoid any breaking changes in wlroots. - wlroots: | cd wlroots - git checkout 0.8.1 + git checkout 0.9.1 meson --prefix=/usr build -Dexamples=false ninja -C build sudo ninja -C build install diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml index 7a5b8f1..54bc9fd 100644 --- a/.builds/archlinux.yml +++ b/.builds/archlinux.yml @@ -15,8 +15,7 @@ tasks: # version, instead of master, to avoid any breaking changes in wlroots. - wlroots: | cd wlroots - # Need this to compile 0.8.1. - git checkout d113e48a2a32542fe6e12f1759f07888364609bf + git checkout 0.9.1 meson --prefix=/usr build -Dexamples=false ninja -C build sudo ninja -C build install diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml index dba93eb..dd0d35d 100644 --- a/.builds/freebsd.yml +++ b/.builds/freebsd.yml @@ -18,8 +18,7 @@ tasks: # version, instead of master, to avoid any breaking changes in wlroots. - wlroots: | cd wlroots - # Need this to compile 0.8.1 - git checkout d113e48a2a32542fe6e12f1759f07888364609bf + git checkout 0.9.1 meson --prefix=/usr/local build -Dexamples=false ninja -C build sudo ninja -C build install diff --git a/meson.build b/meson.build index 0f2c9ff..cbb8f2b 100644 --- a/meson.build +++ b/meson.build @@ -35,7 +35,7 @@ if is_freebsd ) endif -wlroots = dependency('wlroots', version: '>= 0.6.0') +wlroots = dependency('wlroots', version: '>= 0.9.1') wayland_protos = dependency('wayland-protocols', version: '>=1.14') wayland_server = dependency('wayland-server') pixman = dependency('pixman-1')