Signed-off-by: Alexander Kanavin <[email protected]> --- meta/recipes-graphics/clutter/clutter-1.0.inc | 5 ++--- meta/recipes-graphics/clutter/clutter-gst-3.0.inc | 4 +--- meta/recipes-graphics/clutter/clutter-gtk-1.0.inc | 3 +-- meta/recipes-graphics/cogl/cogl-1.0.inc | 8 +++++--- meta/recipes-graphics/mx/mx.inc | 5 ++--- 5 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc index da21cee..0f059f9 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -2,7 +2,7 @@ SUMMARY = "Graphics library for creating hardware-accelerated user interfaces" HOMEPAGE = "http://www.clutter-project.org/"; LICENSE = "LGPLv2.1+" -inherit clutter ptest-gnome +inherit clutter ptest-gnome gobject-introspection DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0" PACKAGE_BEFORE_PN += "${PN}-examples" @@ -17,8 +17,7 @@ EDEPENDS_EVDEV = "libxkbcommon" ERDEPENDS_EVDEV = "xkeyboard-config" # Disable pretty much everything, override in platform specific set up -EXTRA_OECONF += "--disable-introspection \ - --disable-quartz-backend \ +EXTRA_OECONF += "--disable-quartz-backend \ --disable-win32-backend \ --disable-gdk-backend \ --disable-cex100-backend \ diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0.inc b/meta/recipes-graphics/clutter/clutter-gst-3.0.inc index d4fed71..b184e0f 100644 --- a/meta/recipes-graphics/clutter/clutter-gst-3.0.inc +++ b/meta/recipes-graphics/clutter/clutter-gst-3.0.inc @@ -2,7 +2,7 @@ SUMMARY = "GStreamer integration library for Clutter" HOMEPAGE = "http://www.clutter-project.org/"; LICENSE = "LGPLv2+" -inherit clutter +inherit clutter gobject-introspection SRC_URI += "file://0001-Install-example-binary-needed-for-core-image-clutter.patch" @@ -10,8 +10,6 @@ DEPENDS = "gstreamer1.0-plugins-base gstreamer1.0-plugins-bad clutter-1.0" RDEPENDS_${PN} += "gstreamer1.0-meta-base" PACKAGES =+ "${PN}-examples" -EXTRA_OECONF += "--disable-introspection" - FILES_${PN} += "${libdir}/gstreamer-1.0/lib*.so" FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug/lib*.so" diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc index 45898b4..f411cfe 100644 --- a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc @@ -2,11 +2,10 @@ SUMMARY = "Library for embedding a Clutter canvas in a GTK+ application" HOMEPAGE = "http://www.clutter-project.org/"; LICENSE = "LGPLv2+" -inherit clutter +inherit clutter gobject-introspection DEPENDS = "clutter-1.0 gtk+3" PACKAGES =+ "${PN}-examples" AUTOTOOLS_AUXDIR = "${S}/build" -EXTRA_OECONF += "--disable-introspection" diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc index 3da31c8..11425f9 100644 --- a/meta/recipes-graphics/cogl/cogl-1.0.inc +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -2,7 +2,7 @@ SUMMARY = "Modern 3D graphics API with associated utility APIs" HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"; LICENSE = "MIT" -inherit clutter +inherit clutter gobject-introspection DEPENDS = "glib-2.0 gdk-pixbuf" PACKAGES =+ "${PN}-examples \ @@ -24,8 +24,7 @@ ERDEPENDS_GL = "libgl" ERDEPENDS_GLES2 = "libgles2" # GLESv1 is rarely tested, so disable it -EXTRA_OECONF += "--disable-introspection \ - --enable-examples-install \ +EXTRA_OECONF += "--enable-examples-install \ --enable-debug \ --disable-gles1 \ --disable-cairo \ @@ -56,6 +55,9 @@ PACKAGECONFIG ??= "cogl-pango gles2 \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx egl-x11', '', d)} \ " +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/cogl/.libs" +} FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" FILES_libcogl = "${libdir}/libcogl${SOLIBS}" diff --git a/meta/recipes-graphics/mx/mx.inc b/meta/recipes-graphics/mx/mx.inc index ee7f186..024c4cf 100644 --- a/meta/recipes-graphics/mx/mx.inc +++ b/meta/recipes-graphics/mx/mx.inc @@ -1,14 +1,13 @@ SUMMARY = "Clutter based UI widget library" LICENSE = "LGPLv2.1" -inherit clutter autotools-brokensep +inherit clutter autotools-brokensep gobject-introspection DEPENDS = "clutter-1.0 dbus-glib gdk-pixbuf" SRC_URI = "http://source.clutter-project.org/sources/mx/${@get_verdir("${PV}")}/mx-${PV}.tar.xz" -EXTRA_OECONF = "--disable-introspection \ - --disable-gtk-doc \ +EXTRA_OECONF = "--disable-gtk-doc \ --disable-gtk-widgets \ --with-dbus \ --with-winsys=none \ -- 2.1.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
