From 90740e6d3907b2992d404049dfebb6f6dc60c63b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 8 Dec 2020 02:18:17 +0100 Subject: [PATCH] wlroots: initial add 0.12.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-wayland/sway/wlroots.bb | 30 +++++++++++++ ...001-Adjust-meson.build-to-meson-0.54.patch | 43 +++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 recipes-wayland/sway/wlroots.bb create mode 100644 recipes-wayland/sway/wlroots/0001-Adjust-meson.build-to-meson-0.54.patch diff --git a/recipes-wayland/sway/wlroots.bb b/recipes-wayland/sway/wlroots.bb new file mode 100644 index 0000000..4c10a65 --- /dev/null +++ b/recipes-wayland/sway/wlroots.bb @@ -0,0 +1,30 @@ +SUMMARY = "Modules for building a Wayland compositor" +HOMEPAGE = "https://github.com/swaywm/wlroots" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7578fad101710ea2d289ff5411f1b818" + +DEPENDS = " \ + wayland-native \ + wayland \ + wayland-protocols \ + virtual/egl \ + virtual/libgles2 \ + libdrm \ + virtual/libgbm \ + libinput \ + libxkbcommon \ + udev \ + pixman \ +" + +inherit meson features_check + +REQUIRED_DISTRO_FEATURES = "wayland" + +SRC_URI = " \ + git://github.com/swaywm/${BPN}.git \ + file://0001-Adjust-meson.build-to-meson-0.54.patch \ +" +SRCREV = "238d1c078fb03338e9f271d98f7bf6b1fc399285" +PV = "0.12.0" +S = "${WORKDIR}/git" diff --git a/recipes-wayland/sway/wlroots/0001-Adjust-meson.build-to-meson-0.54.patch b/recipes-wayland/sway/wlroots/0001-Adjust-meson.build-to-meson-0.54.patch new file mode 100644 index 0000000..bd09771 --- /dev/null +++ b/recipes-wayland/sway/wlroots/0001-Adjust-meson.build-to-meson-0.54.patch @@ -0,0 +1,43 @@ +From df8a70b2db61a395bb424d4f4942434544e3ef43 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +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 +--- + 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 +