diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2013-07-11 00:56:36 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-13 18:23:34 +0100 |
| commit | 7d013f32abce0961cebd65b3530fc2904fdfda7d (patch) | |
| tree | b9e96f5562c647da54378be0c8cabdeb64744192 /meta/recipes-graphics/cogl | |
| parent | 9b6011c2d11106b3419eb24e603242095b7eaa45 (diff) | |
| download | openembedded-core-contrib-7d013f32abce0961cebd65b3530fc2904fdfda7d.tar.gz | |
cogl-1.0: make building cogl-pango optional
Add a 'cogl-pango' PACKAGECONFIG option and enable it by default.
(From OE-Core rev: 767a2893f6cbc7d48619086970b8ed6262a883e7)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/cogl')
| -rw-r--r-- | meta/recipes-graphics/cogl/cogl-1.0.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc index 8400668e09..c0d410e3b3 100644 --- a/meta/recipes-graphics/cogl/cogl-1.0.inc +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -8,7 +8,7 @@ SRC_URI += "file://cogl_fixed_mul-constraint.patch \ inherit clutter -DEPENDS = "pango glib-2.0 gdk-pixbuf" +DEPENDS = "glib-2.0 gdk-pixbuf" PACKAGES =+ "${PN}-examples \ libcogl libcogl-dev \ libcogl-gles2 libcogl-gles2-dev \ @@ -34,6 +34,8 @@ EXTRA_OECONF += "--disable-introspection \ --disable-gles1 \ " +PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango" + # GL flavours PACKAGECONFIG[gl] = "--enable-gl,--disable-gl,${EDEPENDS_GL},${ERDEPENDS_GL}" PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}" @@ -52,7 +54,7 @@ PACKAGECONFIG[wayland-server] = "--enable-wayland-egl-server,--disable-wayland-e # Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by # default. -PACKAGECONFIG ??= "gl \ +PACKAGECONFIG ??= "cogl-pango gl \ ${@base_contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" |