Commit 9e7efa66 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

Revert "package/weston: libxkbcommon is optional" 

This reverts commit cf1c2eb1.

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: default avatarYann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent df312573

package/weston/Config.in

+1 −10
Original line number Diff line number Diff line
@@ -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

package/weston/weston.mk

+1 −8
Original line number Diff line number Diff line
@@ -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