diff mbox series

[meta-xfce] libxfce4windowing: switch to meson buildsystem

Message ID 20260115072035.466298-1-f_l_k@t-online.de
State New
Headers show
Series [meta-xfce] libxfce4windowing: switch to meson buildsystem | expand

Commit Message

Markus Volk Jan. 15, 2026, 7:20 a.m. UTC 
Motivation for this is to get vapi files created which are required to
e.g. build the budgie desktop

-Add PACKAGECONFIG for x11 and build depending on DISTRO_FEATURES
-Build vala by default

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../libxfce4windowing_4.20.4.bb                | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/meta-xfce/recipes-xfce/libxfce4windowing/libxfce4windowing_4.20.4.bb b/meta-xfce/recipes-xfce/libxfce4windowing/libxfce4windowing_4.20.4.bb
index 5791d48895..a3f1dae3da 100644
--- a/meta-xfce/recipes-xfce/libxfce4windowing/libxfce4windowing_4.20.4.bb
+++ b/meta-xfce/recipes-xfce/libxfce4windowing/libxfce4windowing_4.20.4.bb
@@ -6,20 +6,16 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=435ed639f84d4585d93824e7da3d85da"
 
 DEPENDS = "xfce4-dev-tools-native libdisplay-info libwnck3"
 
+XFCEBASEBUILDCLASS = "meson"
 SRC_URI[sha256sum] = "db467f9ac4bac8f1c4e82667902841fc0957af835c29603d6659a57440b6f8cb"
 
-inherit features_check gobject-introspection gtk-doc xfce
+inherit features_check gobject-introspection gtk-doc xfce vala
 
 # Currently, X11 is fully supported. Wayland is partially supported
-REQUIRED_DISTRO_FEATURES = "x11"
+ANY_OF_DISTRO_FEATURES = "wayland x11"
 
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}"
-PACKAGECONFIG[wayland] = "--enable-wayland, --disable-wayland, wayland-native"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
+PACKAGECONFIG[x11] = "-Dwayland=enabled, -Dwayland=disabled, wayland-native"
+PACKAGECONFIG[wayland] = "-Dwayland=enabled, -Dwayland=disabled, wayland-native"
 
-EXTRA_OECONF = "--enable-x11 \
-                WAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner \
-                "
-
-do_compile:prepend() {
-    export GIR_EXTRA_LIBS_PATH=${B}/libxfce4windowing/.libs
-}
+GTKDOC_MESON_OPTION = "gtk-doc"