wlroots: upgrade 0.12.0 -> 0.14.1

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2021-10-19 22:34:57 +02:00
parent 5a4022b667
commit 97997c2500
2 changed files with 6 additions and 51 deletions

View File

@@ -15,6 +15,7 @@ DEPENDS = " \
libxkbcommon \
udev \
pixman \
seatd \
"
inherit meson pkgconfig features_check
@@ -22,13 +23,10 @@ inherit meson pkgconfig features_check
REQUIRED_DISTRO_FEATURES = "wayland opengl"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','xwayland x11-backend','',d)}"
PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xserver-xorg,xwayland"
PACKAGECONFIG[x11-backend] = "-Dx11-backend=enabled,-Dx11-backend=disabled,xserver-xorg"
PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,virtual/libx11 xwayland xcb-util-wm"
PACKAGECONFIG[x11-backend] = "-Dx11-backend=enabled,-Dx11-backend=disabled,virtual/libx11 xcb-util-renderutil"
SRC_URI = " \
git://github.com/swaywm/${BPN}.git \
file://0001-Adjust-meson.build-to-meson-0.54.patch \
"
SRCREV = "238d1c078fb03338e9f271d98f7bf6b1fc399285"
PV = "0.12.0"
SRC_URI = "git://github.com/swaywm/${BPN}.git;branch=0.14"
SRCREV = "49a574420138646845fb664862db03982cfd9f5b"
PV = "0.14.1"
S = "${WORKDIR}/git"

View File

@@ -1,43 +0,0 @@
From df8a70b2db61a395bb424d4f4942434544e3ef43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 8 Dec 2020 01:57:15 +0100
Subject: [PATCH] Adjust meson.build to meson < 0.54
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* meson.override_dependency is not required here. It requires meson >= 0.54
* we set min version to what dunfell ships
Upstream-Status: Inappropriate[Configuration]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
meson.build | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index 835e0195..b07760ab 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project(
'c',
version: '0.12.0',
license: 'MIT',
- meson_version: '>=0.54.0',
+ meson_version: '>=0.53.2',
default_options: [
'c_std=c11',
'warning_level=2',
@@ -172,8 +172,6 @@ wlroots = declare_dependency(
include_directories: wlr_inc,
)
-meson.override_dependency('wlroots', wlroots)
-
summary({
'systemd': conf_data.get('WLR_HAS_SYSTEMD', 0),
'elogind': conf_data.get('WLR_HAS_ELOGIND', 0),
--
2.26.2