diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2014-06-09 14:15:39 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-06-09 14:28:13 +0200 |
| commit | 9e7efa662e7d2c23c138353b2f1594e6c7b87b87 (patch) | |
| tree | e12f9393a07f1ff239bb690909cebc8d12f45a27 /package/weston | |
| parent | df3125737b95e66f8ef6a3c3574ce6a3cf138998 (diff) | |
Revert "package/weston: libxkbcommon is optional"
This reverts commit cf1c2eb19d3eeddca04013cfa7b2107530abf054.
xkbcommon is still needed for the clients. There's no point in disabling
the clients, or weston is unusable (as packaged in Buildroot.)
Fixes:
http://autobuild.buildroot.org/results/4e9/4e996c65f5b33d4518b0596d9c7076083d491a52/
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/weston')
| -rw-r--r-- | package/weston/Config.in | 11 | ||||
| -rw-r--r-- | package/weston/weston.mk | 9 |
2 files changed, 2 insertions, 18 deletions
diff --git a/package/weston/Config.in b/package/weston/Config.in index 96ebdf168..aaef405e0 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -5,6 +5,7 @@ comment "weston needs udev and a toolchain w/ threads, headers >= 3.0" config BR2_PACKAGE_WESTON bool "weston" select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_LIBXKBCOMMON select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_LIBPNG @@ -28,16 +29,6 @@ config BR2_PACKAGE_WESTON if BR2_PACKAGE_WESTON -config BR2_PACKAGE_WESTON_HW_KBD - bool "enable keyboard support" - default y - select BR2_PACKAGE_LIBXKBCOMMON - help - Say 'y' here if you plan on using a keyboard. - - Only say 'n' if you're going to use a virtual keyboard or any other - input method. - # Helper to make sure at least one compositor is selected. config BR2_PACKAGE_WESTON_HAS_COMPOSITOR bool diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 325cfc751..ed0707b40 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -10,7 +10,7 @@ WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT WESTON_LICENSE_FILES = COPYING -WESTON_DEPENDENCIES = host-pkgconf wayland pixman libpng \ +WESTON_DEPENDENCIES = host-pkgconf wayland libxkbcommon pixman libpng \ jpeg mtdev udev cairo WESTON_CONF_OPT = \ @@ -25,13 +25,6 @@ WESTON_CONF_OPT = \ --disable-weston-launch \ --disable-colord -ifeq ($(BR2_PACKAGE_WESTON_HW_KBD),y) -WESTON_DEPENDENCIES += libxkbcommon -WESTON_CONF_OPT += --enable-xkbcommon -else -WESTON_CONF_OPT += --disable-xkbcommon -endif - ifeq ($(BR2_PACKAGE_LIBINPUT),y) WESTON_DEPENDENCIES += libinput WESTON_CONF_OPT += --enable-libinput-backend |