NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xkeyboard-config: make available outside of X.org, reduce dependencies

Browse Source 
xkeyboard-connfig was selectable only if X.org was enabled. However,
weston, the reference implementation of the Wayland protocol, also
needs xkeyboard-config, so we have to make this package available
outside of the if BR2_PACKAGE_XORG7 ... endif conditional.

In addition to this, the xkeyboard-config currently pulls in
xapp_xkbcomp as a runtime dependency, but this dependency is only
needed with X.org. And it also pulls in xlib_libX11 and xproto_proto
as build-time dependencies. But in fact those ones are runtime
dependencies, and they are only needed under X.org. This helps
reducing the number of dependencies of xkeyboard-config in a
weston/wayland configuration.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Thomas Petazzoni 2013-04-29 10:26:02 +00:00 committed by Peter Korsgaard
parent 7d97a09497
commit dde83bc463
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/Config.in
View File

@ -155,6 +155,7 @@ source "package/x11r7/Config.in"
comment "X libraries and helper libraries" comment "X libraries and helper libraries"
source "package/liberation/Config.in" source "package/liberation/Config.in"
source "package/libsexy/Config.in" source "package/libsexy/Config.in"
source "package/x11r7/xkeyboard-config/Config.in"
comment "X Window managers" comment "X Window managers"
source "package/enlightenment/Config.in" source "package/enlightenment/Config.in"

1
package/x11r7/Config.in
View File

@ -257,7 +257,6 @@ if BR2_PACKAGE_XORG7
source package/x11r7/xdata_xbitmaps/Config.in source package/x11r7/xdata_xbitmaps/Config.in
source package/x11r7/xdata_xcursor-themes/Config.in source package/x11r7/xdata_xcursor-themes/Config.in
source package/x11r7/xcursor-transparent-theme/Config.in source package/x11r7/xcursor-transparent-theme/Config.in
source package/x11r7/xkeyboard-config/Config.in
endmenu endmenu
endif endif

7
package/x11r7/xkeyboard-config/Config.in
View File

@ -1,8 +1,9 @@
config BR2_PACKAGE_XKEYBOARD_CONFIG config BR2_PACKAGE_XKEYBOARD_CONFIG
bool "xkeyboard-config" bool "xkeyboard-config"
select BR2_PACKAGE_XAPP_XKBCOMP # Runtime dependencies
select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XAPP_XKBCOMP if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XPROTO_XPROTO select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XPROTO_XPROTO if BR2_PACKAGE_XORG7
help help
keyboard configuration database for X keyboard configuration database for X

7
package/x11r7/xkeyboard-config/xkeyboard-config.mk
View File

@ -3,10 +3,15 @@
# xkeyboard-config # xkeyboard-config
# #
############################################################# #############################################################
XKEYBOARD_CONFIG_VERSION = 2.6 XKEYBOARD_CONFIG_VERSION = 2.6
XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2
XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config/ XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config/
XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-intltool host-xapp_xkbcomp xlib_libX11 xproto_xproto XKEYBOARD_CONFIG_LICENSE = MIT
XKEYBAORD_CONFIG_LICENSE_FILES = COPYING
XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-intltool host-xapp_xkbcomp
XKEYBOARD_CONFIG_CONF_OPT += --disable-runtime-deps
$(eval $(autotools-package)) $(eval $(autotools-package))