From 9776ad7bf0f1c7d6f5ca3838864a09c49ac678b8 Mon Sep 17 00:00:00 2001 From: MarkusVolk Date: Thu, 23 Dec 2021 17:36:04 +0100 Subject: [PATCH] sway: swaybar and swaynag are now optional --- recipes-wlroots/sway/sway_git.bb | 10 ++++++---- recipes-wlroots/wlroots/wlroots_git.bb | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/recipes-wlroots/sway/sway_git.bb b/recipes-wlroots/sway/sway_git.bb index 73dce03..d1615fe 100644 --- a/recipes-wlroots/sway/sway_git.bb +++ b/recipes-wlroots/sway/sway_git.bb @@ -46,11 +46,13 @@ S = "${WORKDIR}/git" inherit meson pkgconfig features_check -PACKAGECONFIG[default-wallpaper] = "-Ddefault-wallpaper=true,-Ddefault-wallpaper=false" -PACKAGECONFIG[gdk-pixbuf] = "-Dgdk-pixbuf=enabled,-Dgdk-pixbuf=disabled,gdk-pixbuf" -PACKAGECONFIG[systemd] = "-Dsd-bus-provider=libsystemd,,systemd" -PACKAGECONFIG[elogind] = "-Dsd-bus-provider=libelogind,,elogind" PACKAGECONFIG[basu] = "-Dsd-bus-provider=basu,,basu" +PACKAGECONFIG[default-wallpaper] = "-Ddefault-wallpaper=true,-Ddefault-wallpaper=false" +PACKAGECONFIG[elogind] = "-Dsd-bus-provider=libelogind,,elogind" +PACKAGECONFIG[gdk-pixbuf] = "-Dgdk-pixbuf=enabled,-Dgdk-pixbuf=disabled,gdk-pixbuf" +PACKAGECONFIG[swaybar] = "-Dswaybar=true,-Dswaybar=false" +PACKAGECONFIG[swaynag] = "-Dswaynag=true,-Dswaynag=false" +PACKAGECONFIG[systemd] = "-Dsd-bus-provider=libsystemd,,systemd" PACKAGECONFIG[tray] = "-Dtray=enabled,-Dtray=disabled" PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,libxcb" diff --git a/recipes-wlroots/wlroots/wlroots_git.bb b/recipes-wlroots/wlroots/wlroots_git.bb index 3977dc0..57aa16f 100644 --- a/recipes-wlroots/wlroots/wlroots_git.bb +++ b/recipes-wlroots/wlroots/wlroots_git.bb @@ -21,15 +21,15 @@ DEPENDS += " \ wayland-protocols \ " +PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false" +PACKAGECONFIG[gles] = ",,virtual/egl virtual/libgles2" PACKAGECONFIG[libdrm] = ",,libdrm" PACKAGECONFIG[libinput] = ",,libinput" -PACKAGECONFIG[gles] = ",,virtual/egl virtual/libgles2" PACKAGECONFIG[systemd] = ",,systemd" PACKAGECONFIG[sysvinit] = ",,eudev" PACKAGECONFIG[vulkan] = ",,vulkan-loader vulkan-headers glslang glslang-native" PACKAGECONFIG[x11] = ",,xcb-util-renderutil" PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xserver-xorg xcb-util-wm" -PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false" PACKAGECONFIG ?= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \