summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-08-13 10:45:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-16 11:14:30 +0100
commit9146bb6970fe8263e867dff71d5f41589ab292e4 (patch)
tree1e91ec35b74ba80e7901ad1535a009b239f179c2 /meta
parent03b3e4b62f22a8ef435252c0401c5369defabe71 (diff)
downloadpoky-9146bb6970fe8263e867dff71d5f41589ab292e4.tar.gz
cogl: GL/GLX feature cleanup
Separate GL and GLX flags don't make sense, as on Linux GL means GLX and GLX means GL. So, default to GLESv2 and GLX if X11 is enabled. EGL on X11 doesn't have feature parity yet so leave it disabled by default. (From OE-Core rev: e5f8f6c6191505d731c4672353e811d6729d424a) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0.inc17
1 files changed, 9 insertions, 8 deletions
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
index c0d410e3b3..59ff66e1fa 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0.inc
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -28,16 +28,17 @@ EDEPENDS_WAYLAND = "wayland"
28ERDEPENDS_GL = "libgl" 28ERDEPENDS_GL = "libgl"
29ERDEPENDS_GLES2 = "libgles2" 29ERDEPENDS_GLES2 = "libgles2"
30 30
31# GLESv1 is rarely tested, so disable it
31EXTRA_OECONF += "--disable-introspection \ 32EXTRA_OECONF += "--disable-introspection \
32 --enable-examples-install \ 33 --enable-examples-install \
33 --enable-debug \ 34 --enable-debug \
34 --disable-gles1 \ 35 --disable-gles1 \
35 " 36 "
36 37
37PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango" 38# OpenGL/GLX
39PACKAGECONFIG[glx] = "--enable-gl --enable-glx,--disable-gl --disable-glx,${EDEPENDS_GL} ${EDEPENDS_X11},${ERDEPENDS_GL}"
38 40
39# GL flavours 41# GLESv2
40PACKAGECONFIG[gl] = "--enable-gl,--disable-gl,${EDEPENDS_GL},${ERDEPENDS_GL}"
41PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}" 42PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}"
42 43
43# EGL backends 44# EGL backends
@@ -46,15 +47,15 @@ PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platfor
46PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11}" 47PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11}"
47PACKAGECONFIG[egl-wayland] = "--enable-wayland-egl-platform,--disable-wayland-egl-platform,${EDEPENDS_WAYLAND}" 48PACKAGECONFIG[egl-wayland] = "--enable-wayland-egl-platform,--disable-wayland-egl-platform,${EDEPENDS_WAYLAND}"
48 49
49# GLX 50# Wayland (server-side)
50PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,${EDEPENDS_GL} ${EDEPENDS_X11}"
51
52# Wayland server-side
53PACKAGECONFIG[wayland-server] = "--enable-wayland-egl-server,--disable-wayland-egl-server,${EDEPENDS_WAYLAND}" 51PACKAGECONFIG[wayland-server] = "--enable-wayland-egl-server,--disable-wayland-egl-server,${EDEPENDS_WAYLAND}"
54 52
53# Support rendering text directly with Pango
54PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango"
55
55# Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by 56# Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by
56# default. 57# default.
57PACKAGECONFIG ??= "cogl-pango gl \ 58PACKAGECONFIG ??= "cogl-pango gles2 \
58 ${@base_contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ 59 ${@base_contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \
59 ${@base_contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" 60 ${@base_contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}"
60 61