From a5e22ba9d7b82126c53ad373fa59267c870f7d6b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20Kubiz=C5=88=C3=A1k?= Date: Fri, 17 Feb 2023 08:47:13 +0100 Subject: [PATCH] graphene: remove introspection from PACKAGECONFIG MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Assignment of "introspection" as default PACKAGECONFIG value does not reflect gobject-introspection being globally enabled or disabled. As a result, graphene compilation used to fail when g-i was disabled. Use standard means to enable or disable introspection based on machine and distro features, as implemented by gobject-introspection class. Signed-off-by: Petr Kubizňák Signed-off-by: Richard Purdie --- meta/recipes-graphics/graphene/graphene_1.10.8.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/graphene/graphene_1.10.8.bb b/meta/recipes-graphics/graphene/graphene_1.10.8.bb index 75c8258d998..120ee80b177 100644 --- a/meta/recipes-graphics/graphene/graphene_1.10.8.bb +++ b/meta/recipes-graphics/graphene/graphene_1.10.8.bb @@ -9,14 +9,15 @@ inherit gnomebase gobject-introspection gtk-doc SRC_URI[archive.sha256sum] = "a37bb0e78a419dcbeaa9c7027bcff52f5ec2367c25ec859da31dfde2928f279a" -# gtk4 & mutter 41.0 requires graphene build with introspection # Disable neon support by default on ARM-32 platforms because of the # following upstream bug: https://github.com/ebassi/graphene/issues/215 -PACKAGECONFIG ?= "introspection ${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'neon', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'neon', '', d)}" -PACKAGECONFIG[introspection] = "-Dintrospection=enabled,-Dintrospection=disabled," PACKAGECONFIG[neon] = "-Darm_neon=true,-Darm_neon=false," +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + GTKDOC_MESON_OPTION = "gtk_doc" EXTRA_OEMESON = "-Dinstalled_tests=false" -- 2.47.3