summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
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:34:21 +0100
commitfb430271da67d7ec98c285a3420b00db737cae55 (patch)
tree417d7a61e6387fd3ea329dca2372012f3d52d128 /meta/recipes-graphics
parent6df36a004210901acceff4a201d0f910d99eccfe (diff)
downloadopenembedded-core-fb430271da67d7ec98c285a3420b00db737cae55.tar.gz
openembedded-core-fb430271da67d7ec98c285a3420b00db737cae55.tar.bz2
openembedded-core-fb430271da67d7ec98c285a3420b00db737cae55.zip
weston: as weston-launch depends on PAM, control it with a PACKAGECONFIG
Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-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 \
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \
${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
${@base_contains('DISTRO_FEATURES', 'opengles2', 'gles', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \
"
#
# Compositor choices
#
# Weston on KMS
-PACKAGECONFIG[kms] = "--enable-drm-compositor --enable-weston-launch,--disable-drm-compositor --disable-weston-launch,drm udev mesa mtdev libpam"
+PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev mesa mtdev"
# Weston on Wayland (nested Weston)
PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,mesa"
# Weston on X11
@@ -49,7 +50,8 @@ PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/l
PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compositor"
# Weston on framebuffer
PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev"
-
+# weston-launch
+PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam"
# Use cairo-gl or cairo-glesv2
PACKAGECONFIG[gles] = "--with-cairo-glesv2,,virtual/libgles2"