diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-13 19:46:03 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-13 19:46:03 +0000 |
| commit | b05b875995572fa507463009a2317e4f95cdb7bc (patch) | |
| tree | ede8f9d552fe58af7089cce2e254ac5df1e78593 | |
| parent | 6c687a3fb3322c434f34535ed2c6234fbf230160 (diff) | |
xserver_xorg: add options for builtin fonts and aiglx
Patch by Dan Lykowski <lykowdk@gmail.com>
| -rw-r--r-- | package/x11r7/xserver_xorg-server/Config.in | 18 | ||||
| -rw-r--r-- | package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 16 |
2 files changed, 30 insertions, 4 deletions
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 78966b155..7e91235f1 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -11,9 +11,9 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_RANDRPROTO select BR2_PACKAGE_DBUS select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_XFONT_FONT_ALIAS - select BR2_PACKAGE_XFONT_FONT_MISC_MISC - select BR2_PACKAGE_XFONT_FONT_CURSOR_MISC + select BR2_PACKAGE_XFONT_FONT_ALIAS if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS + select BR2_PACKAGE_XFONT_FONT_MISC_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS + select BR2_PACKAGE_XFONT_FONT_CURSOR_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXAU select BR2_PACKAGE_XLIB_LIBXAW @@ -62,3 +62,15 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR depends on BR2_PACKAGE_XSERVER_XORG_SERVER help Don't display root cursor. + +config BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS + bool "Use Builtin Fonts" + depends on BR2_PACKAGE_XSERVER_XORG_SERVER + help + Enable/Use Builtin fonts. + +config BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX + bool "Enable AIGLX Extension" + depends on BR2_PACKAGE_XSERVER_XORG_SERVER + help + Enable/Use AIGLX extension. diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index b390131a9..2e9eddf27 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -31,9 +31,21 @@ else XSERVER_XORG_NULL_CURSOR:=--disable-null-root-cursor endif +ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS),y) +XSERVER_XORG_BUILTIN_FONTS:=--enable-builtin-fonts +else +XSERVER_XORG_BUILTIN_FONTS:=--disable-builtin-fonts +endif + +ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX),y) +XSERVER_XORG_AIGLX:=--enable-aiglx +else +XSERVER_XORG_AIGLX:=--disable-aiglx +endif + XSERVER_XORG_SERVER_DEPENDENCIES = freetype xutil_util-macros xlib_libXfont libdrm xlib_libxkbui \ xproto_compositeproto xproto_damageproto xproto_fixesproto \ - xproto_glproto xproto_kbproto xproto_randrproto freetype \ + xproto_glproto xproto_kbproto xproto_randrproto \ xlib_libX11 xlib_libXau xlib_libXaw xlib_libXdmcp xlib_libXScrnSaver \ xlib_libXext xlib_libXfixes xlib_libXi xlib_libXmu xlib_libXpm \ xlib_libXrender xlib_libXres xlib_libXtst xlib_libXft xlib_libXcursor \ @@ -50,6 +62,8 @@ XSERVER_XORG_SERVER_CONF_OPT = $(XSERVER_XORG_ENABLE_KDRIVE) \ --disable-config-hal $(XSERVER_XORG_MESA_DIR) \ --disable-xnest --disable-xephyr --disable-xvfb \ $(XSERVER_XORG_NULL_CURSOR) \ + $(XSERVER_XORG_BUILTIN_FONTS) \ + $(XSERVER_XORG_AIGLX) \ CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1" XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data |