diff mbox series

[meta-xfce,PATCHv2] libxfce4windowing: switch to meson buildsystem

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

Commit Message

Markus Volk Jan. 15, 2026, 7:37 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               | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

Comments

Khem Raj Jan. 15, 2026, 4:05 p.m. UTC | #1
There is an upgrade for this recipe staged in master-next, Please rebase
this on top if master-next and resend.

On Wed, Jan 14, 2026 at 11:37 PM Markus Volk via lists.openembedded.org
<f_l_k=t-online.de@lists.openembedded.org> wrote:

> 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               | 20 ++++++++-----------
>  1 file changed, 8 insertions(+), 12 deletions(-)
>
> 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..bd292a6530 100644
> --- a/meta-xfce/recipes-xfce/libxfce4windowing/libxfce4windowing_4.20.4.bb
> +++ b/meta-xfce/recipes-xfce/libxfce4windowing/libxfce4windowing_4.20.4.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] =
> "db467f9ac4bac8f1c4e82667902841fc0957af835c29603d6659a57440b6f8cb"
>
> -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"
> --
> 2.52.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#123491):
> https://lists.openembedded.org/g/openembedded-devel/message/123491
> Mute This Topic: https://lists.openembedded.org/mt/117275862/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
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..bd292a6530 100644
--- a/meta-xfce/recipes-xfce/libxfce4windowing/libxfce4windowing_4.20.4.bb
+++ b/meta-xfce/recipes-xfce/libxfce4windowing/libxfce4windowing_4.20.4.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] = "db467f9ac4bac8f1c4e82667902841fc0957af835c29603d6659a57440b6f8cb"
 
-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"