From: Petr Kubizňák <kubiznak@2n.com>
Date: Fri, 17 Feb 2023 07:47:13 +0000 (+0100)
Subject: graphene: remove introspection from PACKAGECONFIG
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~1673
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a5e22ba9d7b82126c53ad373fa59267c870f7d6b;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

graphene: remove introspection from PACKAGECONFIG

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 <kubiznak@2n.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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"