classed/xfce: Add XFCEBASEBUILDCLASS
PATCH 1/2 classed/xfce: Add XFCEBASEBUILDCLASS
Default to autotools to keep the present defaults working, it allows building xfce components with meson, many of newer releases of xfce components are using meson
Signed-off-by Khem Raj <[email protected]>
--- meta-xfce/classes/xfce.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta-xfce/classes/xfce.bbclass +4 -1
@@ -6,7 +6,10 @@ def xfce_verdir(v): HOMEPAGE = "http://www.xfce.org" SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2" -inherit autotools gettext gtk-icon-cache pkgconfig +inherit gettext gtk-icon-cache pkgconfig + +XFCEBASEBUILDCLASS ??= "autotools" +inherit_defer ${XFCEBASEBUILDCLASS} DEPENDS += "intltool-native"
PATCH 2/2 xfce4-clipman-plugin: Use meson for building this recipe
autotools is still supported upstream but meson is preferred starting with 1.7 release
Signed-off-by Khem Raj <[email protected]>
--- .../clipman/xfce4-clipman-plugin_1.7.0.bb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.7.0.bb +7 -5
@@ -8,14 +8,16 @@ inherit xfce-panel-plugin DEPENDS += "xfconf xorgproto libxtst glib-2.0-native" +XFCEBASEBUILDCLASS = "meson" XFCE_COMPRESS_TYPE = "xz" SRC_URI[sha256sum] = "903302c3070a951d44ee17a84fa3cf21d36c6787678af8fbfc79e469fd00cb46" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" -PACKAGECONFIG[qrencode] = "--enable-libqrencode,--disable-libqrencode,qrencode" -PACKAGECONFIG[wayland] = "--enable-wayland, --disable-wayland, wayland-native wayland" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ptest', d)} \ +" -EXTRA_OECONF += "WAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner \ - GLIB_COMPILE_RESOURCES=${STAGING_BINDIR_NATIVE}/glib-compile-resources" +PACKAGECONFIG[ptest] = "-Dtests=true,-Dtests=false," +PACKAGECONFIG[qrencode] = "-Dqrencode=enabled,-Dqrencode=disabled,qrencode" +PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland-native wayland" FILES:${PN} += "${datadir}/metainfo"