From fb04640649750c556916916c2745670a6254ef72 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 22 Jul 2010 15:47:48 +0200 Subject: xserver: tell the X server where fonts are installed All fonts are installed in /usr/share/fonts/X11 and not in /usr/lib/X11/fonts/ where the X server looks by default. Signed-off-by: Thomas Petazzoni --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package/x11r7/xserver_xorg-server') diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 7c12d2454..da288b1ca 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -60,7 +60,8 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \ XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \ --disable-xnest --disable-xephyr --disable-xvfb \ --with-builder-addr=buildroot@uclibc.org \ - CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1" + CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1" \ + --with-fontdir=/usr/share/fonts/X11/ ifeq ($(BR2_PACKAGE_XSERVER_xorg),y) XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg --disable-glx -- cgit v1.2.3 From a43e7e798c8db5787e2ca943ffd46641d2ebd31e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 22 Jul 2010 16:22:32 +0200 Subject: xserver: Add xkeyboard-config as a dependency xkeyboard-config is required to install keymap files to the target, without which the X server does not start. Signed-off-by: Thomas Petazzoni --- package/x11r7/xserver_xorg-server/Config.in | 1 + package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 1 + 2 files changed, 2 insertions(+) (limited to 'package/x11r7/xserver_xorg-server') diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 2d725e448..ddc03c6ae 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -47,6 +47,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO select BR2_PACKAGE_XPROTO_XPROTO select BR2_PACKAGE_XUTIL_UTIL_MACROS + select BR2_PACKAGE_XKEYBOARD_CONFIG depends on !BR2_avr32 help xorg-server 1.7.5 diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index da288b1ca..d9ea57083 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -53,6 +53,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \ xproto_xf86rushproto \ xproto_xf86vidmodeproto \ xproto_xproto \ + xkeyboard-config \ pixman \ openssl \ mcookie -- cgit v1.2.3