diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2016-05-18 13:40:38 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-21 22:24:55 +0100 |
commit | ecd8d8835dbaffae46e5ed67eb3664633fa9b283 (patch) | |
tree | ad503c438e7380beeb3caf4622e2c10ffdc04da2 /meta/recipes-graphics/wayland | |
parent | 959bec103152b42223c429844d34233f47bf0a26 (diff) | |
download | poky-ecd8d8835dbaffae46e5ed67eb3664633fa9b283.tar.gz |
weston: Add PACKAGECONFIG option for 'clients'
This allow Weston to be build without the clients.
(From OE-Core rev: a3084bd681f67b28b4e4b44ba0c6a281800f719d)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@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.10.0.bb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-graphics/wayland/weston_1.10.0.bb b/meta/recipes-graphics/wayland/weston_1.10.0.bb index d3e2607110..16e961de3f 100644 --- a/meta/recipes-graphics/wayland/weston_1.10.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.10.0.bb | |||
@@ -24,9 +24,6 @@ DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" | |||
24 | DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" | 24 | DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" |
25 | 25 | ||
26 | EXTRA_OECONF = "--enable-setuid-install \ | 26 | EXTRA_OECONF = "--enable-setuid-install \ |
27 | --enable-simple-clients \ | ||
28 | --enable-clients \ | ||
29 | --enable-demo-clients-install \ | ||
30 | --disable-rpi-compositor \ | 27 | --disable-rpi-compositor \ |
31 | --disable-rdp-compositor \ | 28 | --disable-rdp-compositor \ |
32 | WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} \ | 29 | WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} \ |
@@ -43,7 +40,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev | |||
43 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | 40 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ |
44 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ | 41 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ |
45 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | 42 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ |
46 | " | 43 | clients" |
47 | # | 44 | # |
48 | # Compositor choices | 45 | # Compositor choices |
49 | # | 46 | # |
@@ -77,6 +74,8 @@ PACKAGECONFIG[systemd] = "--enable-systemd-login,--disable-systemd-login,systemd | |||
77 | PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,libxcb libxcursor cairo" | 74 | PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,libxcb libxcursor cairo" |
78 | # colord CMS support | 75 | # colord CMS support |
79 | PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord" | 76 | PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord" |
77 | # Clients support | ||
78 | PACKAGECONFIG[clients] = "--enable-clients --enable-simple-clients --enable-demo-clients-install,--disable-clients --disable-simple-clients" | ||
80 | 79 | ||
81 | do_install_append() { | 80 | do_install_append() { |
82 | # Weston doesn't need the .la files to load modules, so wipe them | 81 | # Weston doesn't need the .la files to load modules, so wipe them |