diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-03-19 18:23:56 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-22 17:07:16 +0000 |
| commit | e66deb015674f2a95845b6f6722c460dc3ce0a1a (patch) | |
| tree | 16a3ea83eb060f41bdf3717e303ca3f8138d392c /meta/recipes-graphics/wayland | |
| parent | c2f60b6ee7cb70dea2f229de69cce2773de3e59d (diff) | |
| download | poky-e66deb015674f2a95845b6f6722c460dc3ce0a1a.tar.gz | |
mesa: rename mesa-dri recipe to just mesa
Rename mesa-dri recipes to just mesa. Also, replace all references to
mesa-dri in all recipes/configs.
The reason for this renaming (quote from bugzilla):
"mesa-dri is a artefact of mesa-xlib existing, which doesn't anymore.
mesa-dri should be renamed to mesa."
[YOCTO #3385]
(From OE-Core rev: c8bbb9983bcc7cfc5332e89c3e8148505b4ca83f)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland')
| -rw-r--r-- | meta/recipes-graphics/wayland/weston_1.0.3.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-graphics/wayland/weston_1.0.3.bb b/meta/recipes-graphics/wayland/weston_1.0.3.bb index afe8235e10..f769312f32 100644 --- a/meta/recipes-graphics/wayland/weston_1.0.3.bb +++ b/meta/recipes-graphics/wayland/weston_1.0.3.bb | |||
| @@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "3136a7d2f654ea3e946d4217f7e25321248ad2921f1f4e2504dda58968 | |||
| 14 | inherit autotools pkgconfig | 14 | inherit autotools pkgconfig |
| 15 | 15 | ||
| 16 | DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 mtdev jpeg" | 16 | DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 mtdev jpeg" |
| 17 | DEPENDS += "wayland mesa-dri virtual/egl" | 17 | DEPENDS += "wayland mesa virtual/egl" |
| 18 | 18 | ||
| 19 | EXTRA_OECONF = "--disable-android-compositor --enable-setuid-install" | 19 | EXTRA_OECONF = "--disable-android-compositor --enable-setuid-install" |
| 20 | EXTRA_OECONF += "--disable-tablet-shell --disable-xwayland" | 20 | EXTRA_OECONF += "--disable-tablet-shell --disable-xwayland" |
| @@ -25,9 +25,9 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', | |||
| 25 | ${@base_contains('DISTRO_FEATURES', 'opengles2', 'gles', '', d)} \ | 25 | ${@base_contains('DISTRO_FEATURES', 'opengles2', 'gles', '', d)} \ |
| 26 | " | 26 | " |
| 27 | # Weston on KMS | 27 | # Weston on KMS |
| 28 | PACKAGECONFIG[kms] = "--enable-drm-compositor --enable-weston-launch,--disable-drm-compositor --disable-weston-launch,drm udev mesa-dri libpam" | 28 | PACKAGECONFIG[kms] = "--enable-drm-compositor --enable-weston-launch,--disable-drm-compositor --disable-weston-launch,drm udev mesa libpam" |
| 29 | # Weston on Wayland (nested Weston) | 29 | # Weston on Wayland (nested Weston) |
| 30 | PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,mesa-dri" | 30 | PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,mesa" |
| 31 | # Weston on X11 | 31 | # Weston on X11 |
| 32 | PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" | 32 | PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" |
| 33 | 33 | ||