From 3db1883a109b520909b12e91028ce8a79923e8f5 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 19 Feb 2019 18:46:54 +0100 Subject: libmodulemd: update to 2.1.0 Add support for gobject-introspection. Add v2 API fixes to the gtkdoc/gi disabling patch. Add a dependency on glib-native to allow use of glib-mkenums. Disable v2 API/library for now as libdnf is not compatible with it, yet is erroneously linked against it (if it's enabled). Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/libmodulemd/libmodulemd_git.bb | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'meta/recipes-devtools/libmodulemd/libmodulemd_git.bb') diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb index d9bfdc0878..87e92114c8 100644 --- a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb +++ b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb @@ -7,15 +7,24 @@ SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https \ file://0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch \ " -PV = "1.7.0" -SRCREV = "9af3e7b4bec2f8daaa857fa668b858e484487710" +PV = "2.1.0" +SRCREV = "072e6ee791fe7822a6d423bdac7e4a5cbb118bce" S = "${WORKDIR}/git" -inherit meson +inherit meson gobject-introspection -EXTRA_OEMESON = "-Ddeveloper_build=false" +EXTRA_OEMESON = "-Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=false" -DEPENDS += "glib-2.0 libyaml" +DEPENDS += "glib-2.0 libyaml glib-2.0-native" BBCLASSEXTEND = "native nativesdk" + +GI_ENABLE_FLAG = "-Dskip_introspection=false" +GI_DISABLE_FLAG = "-Dskip_introspection=true" + +EXTRA_OEMESON_append_class-nativesdk = " ${GI_DISABLE_FLAG}" +EXTRA_OEMESON_append_class-native = " ${GI_DISABLE_FLAG}" + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ + '${GI_DISABLE_FLAG}', d)} " -- cgit 1.2.3-korg