Commit b05b8759 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

xserver_xorg: add options for builtin fonts and aiglx 

Patch by Dan Lykowski <lykowdk@gmail.com>
parent 6c687a3f

package/x11r7/xserver_xorg-server/Config.in

+15 −3
Original line number Diff line number Diff line
@@ -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.

package/x11r7/xserver_xorg-server/xserver_xorg-server.mk

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