diff options
| author | Andreas Müller <schnitzeltony@googlemail.com> | 2014-01-15 11:11:10 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-16 12:05:47 +0000 |
| commit | e927fdfb04b181dc5186f9bdb259d2988c8fd318 (patch) | |
| tree | 20e8495d365c6e1e7ffd86bd07abac8abcea3bcf /meta/recipes-graphics | |
| parent | e7f8537d5f65daee36004b31ea010bcf243033f8 (diff) | |
| download | poky-e927fdfb04b181dc5186f9bdb259d2988c8fd318.tar.gz | |
weston: cleanup mesa depends
* do not depend by default
* depend on virtual/mesa instead of mesa
(From OE-Core rev: d8d02cb15f9d64f0e773223965e3ff6b6ae0874f)
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.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.3.1.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-graphics/wayland/weston_1.3.1.bb b/meta/recipes-graphics/wayland/weston_1.3.1.bb index d97f6af45b..8e555ee9a6 100644 --- a/meta/recipes-graphics/wayland/weston_1.3.1.bb +++ b/meta/recipes-graphics/wayland/weston_1.3.1.bb | |||
| @@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "f7141334b141ae1a6435bd03bfdb01b7fb628f39259164f201e7e71c8d | |||
| 15 | inherit autotools pkgconfig useradd | 15 | inherit autotools pkgconfig useradd |
| 16 | 16 | ||
| 17 | DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" | 17 | DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" |
| 18 | DEPENDS += "wayland virtual/mesa virtual/egl pango" | 18 | DEPENDS += "wayland virtual/egl pango" |
| 19 | 19 | ||
| 20 | EXTRA_OECONF = "--enable-setuid-install \ | 20 | EXTRA_OECONF = "--enable-setuid-install \ |
| 21 | --disable-tablet-shell \ | 21 | --disable-tablet-shell \ |
| @@ -37,9 +37,9 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', | |||
| 37 | # Compositor choices | 37 | # Compositor choices |
| 38 | # | 38 | # |
| 39 | # Weston on KMS | 39 | # Weston on KMS |
| 40 | PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev mesa mtdev" | 40 | PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa mtdev" |
| 41 | # Weston on Wayland (nested Weston) | 41 | # Weston on Wayland (nested Weston) |
| 42 | PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,mesa" | 42 | PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa" |
| 43 | # Weston on X11 | 43 | # Weston on X11 |
| 44 | PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" | 44 | PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" |
| 45 | # Headless Weston | 45 | # Headless Weston |
