summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorPrabhu Sundararaj <prabhu.sundararaj@freescale.com>2014-03-28 11:02:37 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-30 10:10:35 +0100
commit23f26b563765915dcc5ecfa53bd917d9192bac77 (patch)
treef316d596d204a471a69bd8949a3583475089d508 /meta/recipes-graphics
parent3f0425dc12655e9d513e26788a2217aaaec1d0e0 (diff)
downloadpoky-23f26b563765915dcc5ecfa53bd917d9192bac77.tar.gz
weston : refactor to identify EGL, cairoglesv2 support
(From OE-Core rev: faa86f0cda47f3ea6eeaf4c3fd3cf95a286f4571) Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/wayland/weston_1.4.0.bb9
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/recipes-graphics/wayland/weston_1.4.0.bb b/meta/recipes-graphics/wayland/weston_1.4.0.bb
index e0c354d59f..521316659c 100644
--- a/meta/recipes-graphics/wayland/weston_1.4.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.4.0.bb
@@ -23,13 +23,12 @@ EXTRA_OECONF = "--enable-setuid-install \
23 --enable-simple-clients \ 23 --enable-simple-clients \
24 --enable-clients \ 24 --enable-clients \
25 --enable-demo-clients-install \ 25 --enable-demo-clients-install \
26 --disable-simple-egl-clients \
27 --disable-libunwind \ 26 --disable-libunwind \
28 --disable-rpi-compositor \ 27 --disable-rpi-compositor \
29 --disable-rdp-compositor" 28 --disable-rdp-compositor"
30 29
31 30
32PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland', '', d)} \ 31PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
33 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ 32 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
34 ${@base_contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ 33 ${@base_contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \
35 " 34 "
@@ -39,7 +38,7 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms fbdev way
39# Weston on KMS 38# Weston on KMS
40PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa mtdev" 39PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa mtdev"
41# Weston on Wayland (nested Weston) 40# Weston on Wayland (nested Weston)
42PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-egl --disable-wayland-compositor,virtual/mesa" 41PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa"
43# Weston on X11 42# Weston on X11
44PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" 43PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo"
45# Headless Weston 44# Headless Weston
@@ -50,6 +49,10 @@ PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,ude
50PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam drm" 49PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam drm"
51# VA-API desktop recorder 50# VA-API desktop recorder
52PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva" 51PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva"
52# Weston with EGL support
53PACKAGECONFIG[egl] = "--enable-egl --enable-simple-egl-clients,--disable-egl --disable-simple-egl-clients,virtual/egl"
54# Weston with cairo glesv2 support
55PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo"
53 56
54do_install_append() { 57do_install_append() {
55 # Weston doesn't need the .la files to load modules, so wipe them 58 # Weston doesn't need the .la files to load modules, so wipe them