From 09729b5e63b0659a434b28d9b82bc892c017dfa4 Mon Sep 17 00:00:00 2001 From: Will Wagner Date: Wed, 14 Apr 2010 18:06:40 +0100 Subject: xserver_xorg-server: bump version, improve option support Later version of xserver no longer need configure hack to say where mesa3d is located. Signed-off-by: Will Wagner Acked-by: Paulius Zaleckas Acked-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/Config.in | 35 +++++++++++++++-------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'package/x11r7/xserver_xorg-server/Config.in') diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 86909d10c..e850aba55 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -1,23 +1,26 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER bool "xorg-server" - select BR2_PACKAGE_XLIB_LIBXFONT select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_MCOOKIE + select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_XPROTO_COMPOSITEPROTO - select BR2_PACKAGE_XPROTO_DAMAGEPROTO - select BR2_PACKAGE_XPROTO_FIXESPROTO - select BR2_PACKAGE_XPROTO_GLPROTO - select BR2_PACKAGE_XPROTO_KBPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO + select BR2_PACKAGE_PIXMAN 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_LIBPCIACCESS select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXAU + select BR2_PACKAGE_XLIB_LIBXCURSOR + select BR2_PACKAGE_XLIB_LIBXDAMAGE select BR2_PACKAGE_XLIB_LIBXDMCP select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXFIXES + select BR2_PACKAGE_XLIB_LIBXFONT + select BR2_PACKAGE_XLIB_LIBXFT select BR2_PACKAGE_XLIB_LIBXI + select BR2_PACKAGE_XLIB_LIBXINERAMA + select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_XLIB_LIBXRENDER select BR2_PACKAGE_XLIB_LIBXRES select BR2_PACKAGE_XLIB_LIBXXF86MISC @@ -26,9 +29,15 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XLIB_XTRANS select BR2_PACKAGE_XDATA_XBITMAPS select BR2_PACKAGE_XPROTO_BIGREQSPROTO + select BR2_PACKAGE_XPROTO_COMPOSITEPROTO + select BR2_PACKAGE_XPROTO_DAMAGEPROTO select BR2_PACKAGE_XPROTO_EVIEEXT + select BR2_PACKAGE_XPROTO_FIXESPROTO select BR2_PACKAGE_XPROTO_FONTSPROTO + select BR2_PACKAGE_XPROTO_GLPROTO select BR2_PACKAGE_XPROTO_INPUTPROTO + select BR2_PACKAGE_XPROTO_KBPROTO + select BR2_PACKAGE_XPROTO_RANDRPROTO select BR2_PACKAGE_XPROTO_RENDERPROTO select BR2_PACKAGE_XPROTO_RESOURCEPROTO select BR2_PACKAGE_XPROTO_VIDEOPROTO @@ -41,12 +50,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_XF86RUSHPROTO select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_PIXMAN - select BR2_PACKAGE_XLIB_LIBXSCRNSAVER - select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg + select BR2_PACKAGE_XUTIL_UTIL_MACROS depends on !BR2_avr32 help - xorg-server 1.7.1 + xorg-server 1.7.5 No description available comment "xorg-xserver is BROKEN on AVR32" @@ -58,12 +65,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR 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 -- cgit v1.2.3