jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-01 07:27:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/weston: libxkbcommon is optional

Browse Source 
It is possible to build weston without libxkbcommon, for example
if using an input method that is not an hardware keyboard (e.g. a
virtual keyboard, or none at all.)

Make it optional.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Yann E. MORIN 2014-06-01 23:43:46 +02:00 committed by Peter Korsgaard
parent 8dd771bda7
commit cf1c2eb19d
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package/weston/Config.in
View File

@ -5,7 +5,6 @@ comment "weston needs udev and a toolchain w/ threads, headers >= 3.0"
config BR2_PACKAGE_WESTON config BR2_PACKAGE_WESTON
bool "weston" bool "weston"
select BR2_PACKAGE_WAYLAND select BR2_PACKAGE_WAYLAND
select BR2_PACKAGE_LIBXKBCOMMON
select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO
select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_CAIRO_PNG
select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LIBPNG
@ -29,6 +28,16 @@ config BR2_PACKAGE_WESTON
if 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. # Helper to make sure at least one compositor is selected.
config BR2_PACKAGE_WESTON_HAS_COMPOSITOR config BR2_PACKAGE_WESTON_HAS_COMPOSITOR
bool bool

9
package/weston/weston.mk
View File

@ -10,7 +10,7 @@ WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
WESTON_LICENSE = MIT WESTON_LICENSE = MIT
WESTON_LICENSE_FILES = COPYING WESTON_LICENSE_FILES = COPYING
WESTON_DEPENDENCIES = host-pkgconf wayland libxkbcommon pixman libpng \ WESTON_DEPENDENCIES = host-pkgconf wayland pixman libpng \
jpeg mtdev udev cairo jpeg mtdev udev cairo
WESTON_CONF_OPT = \ WESTON_CONF_OPT = \
@ -25,6 +25,13 @@ WESTON_CONF_OPT = \
--disable-weston-launch \ --disable-weston-launch \
--disable-colord --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_LIBUNWIND),y) ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
WESTON_DEPENDENCIES += libunwind WESTON_DEPENDENCIES += libunwind
else else