1 Commits

Author SHA1 Message Date
Andreas Müller
074101c7c0 wlroots: upgrade TODO libseat
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2021-07-28 15:37:37 +02:00
2 changed files with 16 additions and 16 deletions

View File

@@ -13,6 +13,7 @@ DEPENDS = " \
virtual/libgbm \ virtual/libgbm \
libinput \ libinput \
libxkbcommon \ libxkbcommon \
xcb-util-renderutil \
udev \ udev \
pixman \ pixman \
" "
@@ -26,9 +27,9 @@ PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xserver-xorg,x
PACKAGECONFIG[x11-backend] = "-Dx11-backend=enabled,-Dx11-backend=disabled,xserver-xorg" PACKAGECONFIG[x11-backend] = "-Dx11-backend=enabled,-Dx11-backend=disabled,xserver-xorg"
SRC_URI = " \ SRC_URI = " \
git://github.com/swaywm/${BPN}.git \ git://github.com/swaywm/${BPN}.git;branch=0.14 \
file://0001-Adjust-meson.build-to-meson-0.54.patch \ file://0001-Adjust-meson.build-to-meson-0.54.patch \
" "
SRCREV = "238d1c078fb03338e9f271d98f7bf6b1fc399285" SRCREV = "49a574420138646845fb664862db03982cfd9f5b"
PV = "0.12.0" PV = "0.14.1"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"

View File

@@ -1,6 +1,6 @@
From df8a70b2db61a395bb424d4f4942434544e3ef43 Mon Sep 17 00:00:00 2001 From df8a70b2db61a395bb424d4f4942434544e3ef43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 8 Dec 2020 01:57:15 +0100 Date: Wed, 28 Jul 2021 15:21:28 +0200
Subject: [PATCH] Adjust meson.build to meson < 0.54 Subject: [PATCH] Adjust meson.build to meson < 0.54
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
@@ -13,31 +13,30 @@ Upstream-Status: Inappropriate[Configuration]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
--- ---
meson.build | 4 +--- meson.build | 3 +--
1 file changed, 1 insertion(+), 3 deletions(-) 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 835e0195..b07760ab 100644 index d8078212..9494b9ca 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -3,7 +3,7 @@ project( @@ -3,7 +3,7 @@ project(
'c', 'c',
version: '0.12.0', version: '0.14.1',
license: 'MIT', license: 'MIT',
- meson_version: '>=0.54.0', - meson_version: '>=0.56.0',
+ meson_version: '>=0.53.2', + meson_version: '>=0.53.2',
default_options: [ default_options: [
'c_std=c11', 'c_std=c11',
'warning_level=2', 'warning_level=2',
@@ -172,8 +172,6 @@ wlroots = declare_dependency( @@ -164,7 +164,6 @@ wlroots = declare_dependency(
include_directories: wlr_inc, variables: wlr_vars,
) )
-meson.override_dependency('wlroots', wlroots) -meson.override_dependency('wlroots', wlroots)
-
summary({ summary(features + internal_features, bool_yn: true)
'systemd': conf_data.get('WLR_HAS_SYSTEMD', 0),
'elogind': conf_data.get('WLR_HAS_ELOGIND', 0),
-- --
2.26.2 2.31.1