summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-09-11 14:28:57 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-11 23:35:45 +0100
commitcdc3549c9c0f13c440006d7da82a2281a46b2086 (patch)
tree7cddc0437a33bd8e0cbd064fa71ccec506936da6 /meta
parent1b25cf710ea0fdfb73b8b19f8832e34a20a36ee1 (diff)
downloadpoky-cdc3549c9c0f13c440006d7da82a2281a46b2086.tar.gz
weston: as weston-launch depends on PAM, control it with a PACKAGECONFIG
(From OE-Core rev: fb430271da67d7ec98c285a3420b00db737cae55) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/wayland/weston_1.1.0.bb6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-graphics/wayland/weston_1.1.0.bb b/meta/recipes-graphics/wayland/weston_1.1.0.bb
index c7c64adc4d..b765f65538 100644
--- a/meta/recipes-graphics/wayland/weston_1.1.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.1.0.bb
@@ -35,12 +35,13 @@ EXTRA_OECONF = "--disable-android-compositor \
35PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \ 35PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \
36 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ 36 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
37 ${@base_contains('DISTRO_FEATURES', 'opengles2', 'gles', '', d)} \ 37 ${@base_contains('DISTRO_FEATURES', 'opengles2', 'gles', '', d)} \
38 ${@base_contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \
38 " 39 "
39# 40#
40# Compositor choices 41# Compositor choices
41# 42#
42# Weston on KMS 43# Weston on KMS
43PACKAGECONFIG[kms] = "--enable-drm-compositor --enable-weston-launch,--disable-drm-compositor --disable-weston-launch,drm udev mesa mtdev libpam" 44PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev mesa mtdev"
44# Weston on Wayland (nested Weston) 45# Weston on Wayland (nested Weston)
45PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,mesa" 46PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,mesa"
46# Weston on X11 47# Weston on X11
@@ -49,7 +50,8 @@ PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/l
49PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compositor" 50PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compositor"
50# Weston on framebuffer 51# Weston on framebuffer
51PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev" 52PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev"
52 53# weston-launch
54PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam"
53# Use cairo-gl or cairo-glesv2 55# Use cairo-gl or cairo-glesv2
54PACKAGECONFIG[gles] = "--with-cairo-glesv2,,virtual/libgles2" 56PACKAGECONFIG[gles] = "--with-cairo-glesv2,,virtual/libgles2"
55 57