summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-05-31 15:57:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-07 16:48:26 +0100
commit2a739ad148d8a6ea531488e8495877d84acd5c12 (patch)
tree385791f2a82584b43700ff735297eb50df555afa /meta/recipes-graphics
parent74351853dcb2b42bc517318da5c7a437b1ea5bdb (diff)
downloadpoky-2a739ad148d8a6ea531488e8495877d84acd5c12.tar.gz
weston: update to 1.1.0
Upgrade to 1.1.0, and disable the RaspberryPi and RDP compositors. Hopefully the RPi community can send a patch to add a PACKAGECONFIG for them. (From OE-Core rev: 2e8e31a6812368688138b53c0aa92982354f832f) 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>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/wayland/weston_1.1.0.bb (renamed from meta/recipes-graphics/wayland/weston_1.0.6.bb)15
1 files changed, 12 insertions, 3 deletions
diff --git a/meta/recipes-graphics/wayland/weston_1.0.6.bb b/meta/recipes-graphics/wayland/weston_1.1.0.bb
index 9d5d626a86..026f13666b 100644
--- a/meta/recipes-graphics/wayland/weston_1.0.6.bb
+++ b/meta/recipes-graphics/wayland/weston_1.1.0.bb
@@ -9,8 +9,9 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
9 file://install-examples.patch \ 9 file://install-examples.patch \
10 file://weston.png \ 10 file://weston.png \
11 file://weston.desktop" 11 file://weston.desktop"
12SRC_URI[md5sum] = "63202129d66d5514e572814da5dfa1f7" 12SRC_URI[md5sum] = "dd9f3043fc5228c6bc4e99873fae2254"
13SRC_URI[sha256sum] = "c833bc4dc8667561d2639b57220541531c039aa9332ce2a7022a3c466eb894f1" 13SRC_URI[sha256sum] = "e7715d2c731f77a729c994a599ffdaebac1307b2dd9336136706869fa53618b4"
14
14 15
15inherit autotools pkgconfig useradd 16inherit autotools pkgconfig useradd
16 17
@@ -23,7 +24,11 @@ EXTRA_OECONF = "--disable-android-compositor \
23 --disable-xwayland \ 24 --disable-xwayland \
24 --enable-simple-clients \ 25 --enable-simple-clients \
25 --enable-clients \ 26 --enable-clients \
26 --disable-simple-egl-clients" 27 --disable-simple-egl-clients \
28 --disable-libunwind \
29 --disable-rpi-compositor \
30 --disable-rdp-compositor"
31
27 32
28PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \ 33PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \
29 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ 34 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
@@ -38,6 +43,10 @@ PACKAGECONFIG[kms] = "--enable-drm-compositor --enable-weston-launch,--disable-d
38PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,mesa" 43PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,mesa"
39# Weston on X11 44# Weston on X11
40PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" 45PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo"
46# Headless Weston
47PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compositor"
48# Weston on framebuffer
49PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev"
41 50
42# Use cairo-gl or cairo-glesv2 51# Use cairo-gl or cairo-glesv2
43PACKAGECONFIG[gles] = "--with-cairo-glesv2,,virtual/libgles2" 52PACKAGECONFIG[gles] = "--with-cairo-glesv2,,virtual/libgles2"