sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Andreas Oberritter 2013-07-11 00:56:36 +00:00 committed by Richard Purdie
parent 9b6011c2d1
commit 7d013f32ab
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta/recipes-graphics/cogl/cogl-1.0.inc
View File

@ -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)}"