From: Andreas Müller <schnitzeltony@gmail.com>
Date: Fri, 5 Apr 2019 06:37:27 +0000 (+0200)
Subject: gdk-pixbuf: use gobject-introspection.bbclass on/off mechanism
X-Git-Tag: 2019-04~34
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=8ffb0a5f88cbebfa19e5eee337d00f6e5214ba34;p=openembedded-core.git

gdk-pixbuf: use gobject-introspection.bbclass on/off mechanism

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb
index c5de7a92a5..e423b99687 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb
@@ -37,13 +37,7 @@ inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even
 GTKDOC_ENABLE_FLAG = "-Ddocs=true"
 GTKDOC_DISABLE_FLAG = "-Ddocs=false"
 
-GI_ENABLE_FLAG = "-Dgir=true"
-GI_DISABLE_FLAG = "-Dgir=false"
-
-EXTRA_OEMESON_append_class-nativesdk = " ${GI_DISABLE_FLAG}"
-
-EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \
-                                                                                       '${GI_DISABLE_FLAG}', d)} "
+GIR_MESON_OPTION = 'gir'
 
 EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \
                                                                                      '${GTKDOC_DISABLE_FLAG}', d)} "