From faa86f0cda47f3ea6eeaf4c3fd3cf95a286f4571 Mon Sep 17 00:00:00 2001 From: Prabhu Sundararaj Date: Fri, 28 Mar 2014 11:02:37 -0300 Subject: weston : refactor to identify EGL, cairoglesv2 support Signed-off-by: Prabhu Sundararaj Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston_1.4.0.bb | 9 ++++++--- 1 file 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 \ --enable-simple-clients \ --enable-clients \ --enable-demo-clients-install \ - --disable-simple-egl-clients \ --disable-libunwind \ --disable-rpi-compositor \ --disable-rdp-compositor" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland', '', d)} \ +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ " @@ -39,7 +38,7 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms fbdev way # Weston on KMS PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa mtdev" # Weston on Wayland (nested Weston) -PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-egl --disable-wayland-compositor,virtual/mesa" +PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa" # Weston on X11 PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" # Headless Weston @@ -50,6 +49,10 @@ PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,ude PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam drm" # VA-API desktop recorder PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva" +# Weston with EGL support +PACKAGECONFIG[egl] = "--enable-egl --enable-simple-egl-clients,--disable-egl --disable-simple-egl-clients,virtual/egl" +# Weston with cairo glesv2 support +PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo" do_install_append() { # Weston doesn't need the .la files to load modules, so wipe them -- cgit v1.2.3