libbxfce4windowing: switch to meson buildsystem

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>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

1 files changed, 8 insertions, 12 deletions

diff --git a/meta-xfce/recipes-xfce/libxfce4windowing/libxfce4windowing_4.20.5.bb b/meta-xfce/recipes-xfce/libxfce4windowing/libxfce4windowing_4.20.5.bb
index 764254eb10..59374d7947 100644
--- a/meta-xfce/recipes-xfce/libxfce4windowing/libxfce4windowing_4.20.5.bb
+++ b/meta-xfce/recipes-xfce/libxfce4windowing/libxfce4windowing_4.20.5.bb
@@ -4,22 +4,18 @@ SECTION = "x11/libs"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=435ed639f84d4585d93824e7da3d85da"
 
-DEPENDS = "xfce4-dev-tools-native libdisplay-info libwnck3"
+DEPENDS = "xfce4-dev-tools-native glib-2.0 gtk+3"
 
+XFCEBASEBUILDCLASS = "meson"
 SRC_URI[sha256sum] = "6b4e19a66db650c9c8a88f00bbf266e9ced0070b7dbc0aaeea05be0fc6a2eb4d"
 
-inherit features_check gobject-introspection gtk-doc xfce
+inherit features_check gobject-introspection gtk-doc xfce vala gettext
 
 # 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] = "-Dx11=enabled, -Dx11=disabled, libx11 libdisplay-info libwnck3 xrandr"
+PACKAGECONFIG[wayland] = "-Dwayland=enabled, -Dwayland=disabled, wayland wayland-native wayland-protocols"
 
-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"