From c467d85a6d138da70b0cb1c2697101e41e6129ba Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Sun, 23 Jan 2022 14:34:55 +0300 Subject: cage: use old wlroots --- wayland/cage/build | 23 +++++++++++++++++++++++ wayland/cage/checksums | 4 +++- wayland/cage/depends | 1 - wayland/cage/sources | 1 + wayland/cage/version | 2 +- 5 files changed, 28 insertions(+), 3 deletions(-) diff --git a/wayland/cage/build b/wayland/cage/build index 77a0e800..913220ab 100755 --- a/wayland/cage/build +++ b/wayland/cage/build @@ -1,6 +1,29 @@ #!/bin/sh -e +export WLROOTS_DIR="$PWD/pkg" + +( +cd wlroots + +export DESTDIR="$WLROOTS_DIR" + +cl-meson \ + --default-library=static \ + -Dexamples=false \ + -Dxwayland=enabled \ + -Dx11-backend=enabled \ + -Drenderers=gles2 \ + . output + +ninja -C output +ninja -C output install +) + export DESTDIR="$1" +export LDLIBS="$LDLIBS -L$WLROOTS_DIR/usr/lib $WLROOTS_DIR/usr/lib/libwlroots.a" +export LDFLAGS="$LDFLAGS -L$WLROOTS_DIR/usr/lib $WLROOTS_DIR/usr/lib/libwlroots.a" +export CFLAGS="$CFLAGS -I$WLROOTS_DIR/usr/include" +export PKG_CONFIG_PATH=$WLROOTS_DIR/usr/lib/pkgconfig cl-meson \ -Dman-pages=enabled \ diff --git a/wayland/cage/checksums b/wayland/cage/checksums index e28095ce..3adf282a 100644 --- a/wayland/cage/checksums +++ b/wayland/cage/checksums @@ -1 +1,3 @@ -dfe27fb0c7d43db72d6c82f01e2736580a0791a23ba69d7b56285d08af98ad90 cage-0.1.4.tar.gz +%BLAKE3 +335e716e2c2b97d92a961d9964d7ca8212bb9c3fd113e8178ac5cfa7ea5c3253 cage-0.1.4.tar.gz +18da32d3d0119e7d990bc69d04fea60ca828c9ae56a9b0be635f443cad1ba1d3 wlroots-0.14.1.tar.gz diff --git a/wayland/cage/depends b/wayland/cage/depends index 3b5f5f1c..dc903eef 100644 --- a/wayland/cage/depends +++ b/wayland/cage/depends @@ -4,4 +4,3 @@ pixman scdoc make wayland wayland-protocols make -wlroots diff --git a/wayland/cage/sources b/wayland/cage/sources index a7665907..02d8c68b 100644 --- a/wayland/cage/sources +++ b/wayland/cage/sources @@ -1 +1,2 @@ https://github.com/Hjdskes/cage/releases/download/v0.1.4/cage-0.1.4.tar.gz +https://github.com/swaywm/wlroots/releases/download/0.14.1/wlroots-0.14.1.tar.gz wlroots diff --git a/wayland/cage/version b/wayland/cage/version index 3aefaafc..f2be85fa 100644 --- a/wayland/cage/version +++ b/wayland/cage/version @@ -1 +1 @@ -0.1.4 1 +0.1.4 2 -- cgit v1.2.3