diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-05-31 14:36:05 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-07 16:48:24 +0100 |
| commit | 271ea8b628e5a18bff66fcf37efb7e1ef5c26754 (patch) | |
| tree | 3551b3f1816900413bba7824b382f01a291663cd | |
| parent | fcbf8659927ba73880930d08a12a16dd103c9099 (diff) | |
| download | poky-271ea8b628e5a18bff66fcf37efb7e1ef5c26754.tar.gz | |
weston: clean up and add comments
(From OE-Core rev: 46159f632513de1f14d03e425799a0c193532298)
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>
| -rw-r--r-- | meta/recipes-graphics/wayland/weston_1.0.6.bb | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/meta/recipes-graphics/wayland/weston_1.0.6.bb b/meta/recipes-graphics/wayland/weston_1.0.6.bb index 07811f2831..9d5d626a86 100644 --- a/meta/recipes-graphics/wayland/weston_1.0.6.bb +++ b/meta/recipes-graphics/wayland/weston_1.0.6.bb | |||
| @@ -17,14 +17,21 @@ inherit autotools pkgconfig useradd | |||
| 17 | DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 mtdev jpeg" | 17 | DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 mtdev jpeg" |
| 18 | DEPENDS += "wayland mesa virtual/egl" | 18 | DEPENDS += "wayland mesa virtual/egl" |
| 19 | 19 | ||
| 20 | EXTRA_OECONF = "--disable-android-compositor --enable-setuid-install" | 20 | EXTRA_OECONF = "--disable-android-compositor \ |
| 21 | EXTRA_OECONF += "--disable-tablet-shell --disable-xwayland" | 21 | --enable-setuid-install \ |
| 22 | EXTRA_OECONF += "--enable-simple-clients --enable-clients --disable-simple-egl-clients" | 22 | --disable-tablet-shell \ |
| 23 | --disable-xwayland \ | ||
| 24 | --enable-simple-clients \ | ||
| 25 | --enable-clients \ | ||
| 26 | --disable-simple-egl-clients" | ||
| 23 | 27 | ||
| 24 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \ | 28 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \ |
| 25 | ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | 29 | ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ |
| 26 | ${@base_contains('DISTRO_FEATURES', 'opengles2', 'gles', '', d)} \ | 30 | ${@base_contains('DISTRO_FEATURES', 'opengles2', 'gles', '', d)} \ |
| 27 | " | 31 | " |
| 32 | # | ||
| 33 | # Compositor choices | ||
| 34 | # | ||
| 28 | # Weston on KMS | 35 | # Weston on KMS |
| 29 | PACKAGECONFIG[kms] = "--enable-drm-compositor --enable-weston-launch,--disable-drm-compositor --disable-weston-launch,drm udev mesa libpam" | 36 | PACKAGECONFIG[kms] = "--enable-drm-compositor --enable-weston-launch,--disable-drm-compositor --disable-weston-launch,drm udev mesa libpam" |
| 30 | # Weston on Wayland (nested Weston) | 37 | # Weston on Wayland (nested Weston) |
| @@ -32,6 +39,7 @@ PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-composit | |||
| 32 | # Weston on X11 | 39 | # Weston on X11 |
| 33 | PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" | 40 | PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" |
| 34 | 41 | ||
| 42 | # Use cairo-gl or cairo-glesv2 | ||
| 35 | PACKAGECONFIG[gles] = "--with-cairo-glesv2,,virtual/libgles2" | 43 | PACKAGECONFIG[gles] = "--with-cairo-glesv2,,virtual/libgles2" |
| 36 | 44 | ||
| 37 | do_install_append() { | 45 | do_install_append() { |
