summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2013-07-11 00:56:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-13 18:23:34 +0100
commit7d013f32abce0961cebd65b3530fc2904fdfda7d (patch)
treeb9e96f5562c647da54378be0c8cabdeb64744192
parent9b6011c2d11106b3419eb24e603242095b7eaa45 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0.inc6
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 \
8 8
9inherit clutter 9inherit clutter
10 10
11DEPENDS = "pango glib-2.0 gdk-pixbuf" 11DEPENDS = "glib-2.0 gdk-pixbuf"
12PACKAGES =+ "${PN}-examples \ 12PACKAGES =+ "${PN}-examples \
13 libcogl libcogl-dev \ 13 libcogl libcogl-dev \
14 libcogl-gles2 libcogl-gles2-dev \ 14 libcogl-gles2 libcogl-gles2-dev \
@@ -34,6 +34,8 @@ EXTRA_OECONF += "--disable-introspection \
34 --disable-gles1 \ 34 --disable-gles1 \
35 " 35 "
36 36
37PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango"
38
37# GL flavours 39# GL flavours
38PACKAGECONFIG[gl] = "--enable-gl,--disable-gl,${EDEPENDS_GL},${ERDEPENDS_GL}" 40PACKAGECONFIG[gl] = "--enable-gl,--disable-gl,${EDEPENDS_GL},${ERDEPENDS_GL}"
39PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}" 41PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}"
@@ -52,7 +54,7 @@ PACKAGECONFIG[wayland-server] = "--enable-wayland-egl-server,--disable-wayland-e
52 54
53# Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by 55# Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by
54# default. 56# default.
55PACKAGECONFIG ??= "gl \ 57PACKAGECONFIG ??= "cogl-pango gl \
56 ${@base_contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ 58 ${@base_contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \
57 ${@base_contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" 59 ${@base_contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}"
58 60