diff options
Diffstat (limited to 'meta/recipes-graphics/cogl/cogl-1.0.inc')
| -rw-r--r-- | meta/recipes-graphics/cogl/cogl-1.0.inc | 47 |
1 files changed, 18 insertions, 29 deletions
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc index b763dd5ba8..7a79aa789a 100644 --- a/meta/recipes-graphics/cogl/cogl-1.0.inc +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -2,14 +2,14 @@ SUMMARY = "Modern 3D graphics API with associated utility APIs" HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl" LICENSE = "MIT" -inherit clutter +inherit clutter distro_features_check upstream-version-is-even gobject-introspection +# cogl-1.0 needs opengl to build +REQUIRED_DISTRO_FEATURES ?= "opengl" DEPENDS = "glib-2.0 gdk-pixbuf" PACKAGES =+ "${PN}-examples \ - libcogl libcogl-dev \ - libcogl-gles2 libcogl-gles2-dev \ - libcogl-pango libcogl-pango-dev \ - libcogl-path libcogl-path-dev" + libcogl libcogl-gles2 libcogl-pango libcogl-path \ + " AUTOTOOLS_AUXDIR = "${S}/build" # Extra DEPENDS for PACKAGECONFIG @@ -26,8 +26,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 \ @@ -42,7 +41,7 @@ PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDE # EGL backends PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}" PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform" -PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11}" +PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11} ${EDEPENDS_EGL}" PACKAGECONFIG[egl-wayland] = "--enable-wayland-egl-platform,--disable-wayland-egl-platform,${EDEPENDS_WAYLAND}" # Wayland (server-side) @@ -55,34 +54,24 @@ PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango" # default. PACKAGECONFIG ??= "cogl-pango gles2 \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx egl-x11', '', d)} \ + " +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/cogl/.libs" +} + +FILES_${PN} = "" FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" -FILES_libcogl = "${libdir}/libcogl${SOLIBS}" -FILES_libcogl-dev = "${includedir}/cogl/cogl \ - ${libdir}/libcogl${SOLIBSDEV} \ - ${libdir}/libcogl.la \ - ${libdir}/pkgconfig/cogl-1.0.pc \ - ${libdir}/pkgconfig/cogl-2.0-experimental.pc \ - ${libdir}/pkgconfig/cogl-gl-1.0.pc" +FILES_libcogl = "${libdir}/libcogl${SOLIBS} ${libdir}/girepository-1.0/Cogl-*.typelib" FILES_libcogl-gles2 = "${libdir}/libcogl-gles2${SOLIBS}" -FILES_libcogl-gles2-dev = "${includedir}/cogl/cogl-gles2 \ - ${libdir}/libcogl-gles2${SOLIBSDEV} \ - ${libdir}/libcogl-gles2.la \ - ${libdir}/pkgconfig/cogl-gles2-experimental.pc" -FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS}" -FILES_libcogl-pango-dev = "${includedir}/cogl/cogl-pango \ - ${libdir}/libcogl-pango${SOLIBSDEV} \ - ${libdir}/libcogl-pango.la \ - ${libdir}/pkgconfig/cogl-pango-1.0.pc" +FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS} ${libdir}/girepository-1.0/CoglPango*.typelib" FILES_libcogl-path = "${libdir}/libcogl-path${SOLIBS}" -FILES_libcogl-path-dev = "${includedir}/cogl/cogl-path \ - ${libdir}/libcogl-path${SOLIBSDEV} \ - ${libdir}/libcogl-path.la \ - ${libdir}/pkgconfig/cogl-path-1.0.pc" # For backwards compatibility after Debian-renaming RPROVIDES_libcogl = "cogl-1.0" RCONFLICTS_libcogl = "cogl-1.0" RREPLACES_libcogl = "cogl-1.0" + +COMPATIBLE_HOST_armv4 = 'null' |