packages: fix xorg to compile modular and tiny versions

Based on googlecode r558 by John Voltz.
2008-06-30 12:55:29 +00:00 · 2008-06-30 12:55:29 +00:00 · d4e56ff4dc
commit d4e56ff4dc
parent af593cbcee
125 changed files with 804 additions and 2526 deletions
--- a/package/Config.in
+++ b/package/Config.in
@ -353,24 +353,15 @@ source "package/qtopia4/Config.in"

 #source "package/microwin/Config.in"

-choice
-prompt "X Window System server"
-	default BR2_PACKAGE_XSERVER_none
-	help
-	  Xserver to use.
-	  For more information about the X protocol see
-	  http://www.x.org
-	  You may have to enable LOCALE and WCHAR to build

+menu "X Window System server"
 config BR2_PACKAGE_XSERVER_none
 	bool "none"
-config BR2_PACKAGE_XSERVER_x11r7
-	bool "x11r7"
 config BR2_PACKAGE_XSERVER_xorg
-	bool "xorg"
+	bool "modular xorg"
 config BR2_PACKAGE_XSERVER_tinyx
 	bool "tinyx"
-endchoice
+endmenu

 config BR2_X11_PREFIX
 	string
@ -379,16 +370,9 @@ config BR2_X11_PREFIX
 	help
 	  X11 apps root location

-if BR2_PACKAGE_XSERVER_x11r7
+if !BR2_PACKAGE_XSERVER_none
 source "package/x11r7/Config.in"
 endif
-if BR2_PACKAGE_XSERVER_xorg
-source "package/xorg/Config.in"
-endif
-if BR2_PACKAGE_XSERVER_tinyx
-source "package/tinyx/Config.in"
-source "package/tinyx-old/Config.in"
-endif

 comment "X libraries and helper libraries"
 #XXX: maybe some of these should depend on !BR2_PACKAGE_XSERVER_none
--- a/package/tinyx-old/Config.in
+++ b/package/tinyx-old/Config.in
@ -1,6 +0,0 @@
-config BR2_PACKAGE_TINYX_OLD
-	bool "tinyx (old version. which supposedly builds)"
-	default n
-	depends on BR2_PACKAGE_TINYX
-	help
-	  A tiny X server.  Also known as 'Xfbdev' and 'kdrive'.
--- a/package/tinyx-old/tinyx-011010.patch
+++ b/package/tinyx-old/tinyx-011010.patch
@ -1,195 +0,0 @@
--- xc-011010/config/cf/X11.tmpl.orig	2005-05-12 16:16:17.000000000 -0600
-+++ xc-011010/config/cf/X11.tmpl	2005-05-12 16:16:23.000000000 -0600
-@@ -3055,7 +3055,7 @@
- 	$(RM) index.raw file.nPS file.PS file.txt
- #endif
- 
-#ifndef MakeSimpleDoc(file,srcs)
-+#ifndef MakeSimpleDoc
- #define MakeSimpleDoc(file,srcs) MakeDepSimpleDoc(file,srcs,srcs)
- #endif
- 
--- xc-011010/config/cf/kdrive.cf.orig	2005-05-12 16:14:50.000000000 -0600
-+++ xc-011010/config/cf/kdrive.cf	2005-05-12 16:15:03.000000000 -0600
-@@ -201,7 +201,7 @@
- #undef ServerOSDefines
- #define ServerOSDefines -DDDXOSINIT
- 
-#ifndef Other IConfigFiles
-+#ifndef OtherIConfigFiles
- #define OtherIConfigFile $(IRULESRC)/kdrive.cf
- #endif
- 
-diff -Nur --exclude=CVS xc-011010.src/include/extensions/lbxstr.h xc-011010/include/extensions/lbxstr.h
--- xc-011010.src/include/extensions/lbxstr.h	Tue Jul 31 20:44:35 2001
-+++ xc-011010/include/extensions/lbxstr.h	Sun Apr 21 12:35:05 2002
-@@ -25,7 +25,7 @@
- #ifndef _LBXSTR_H_
- #define _LBXSTR_H_
- 
-#include <X11/extensions/XLbx.h>
-+#include "XLbx.h"
- 
- #define LBXNAME "LBX"
- 
-diff -Nur --exclude=CVS xc-011010.src/programs/Xserver/hw/kdrive/fbdev/fbdev.h xc-011010/programs/Xserver/hw/kdrive/fbdev/fbdev.h
--- xc-011010.src/programs/Xserver/hw/kdrive/fbdev/fbdev.h	Sun Jun  3 17:52:45 2001
-+++ xc-011010/programs/Xserver/hw/kdrive/fbdev/fbdev.h	Sun Apr 21 12:36:25 2002
-@@ -29,6 +29,7 @@
- #include <linux/fb.h>
- #include <unistd.h>
- #include <sys/mman.h>
-+#include <sys/types.h>
- #include "kdrive.h"
- #include "layer.h"
-
-diff -Nur xc-011010.src2/lib/X11/Xlib.h xc-011010/lib/X11/Xlib.h
--- xc-011010.src/programs/Xserver/hw/kdrive/linux/ts.c	Tue Jul 10 22:58:19 2001
-+++ xc-011010/programs/Xserver/hw/kdrive/linux/ts.c	Tue Apr 23 20:16:23 2002
-@@ -33,65 +33,48 @@
- #include "kdrive.h"
- #include "Xpoll.h"
- #include <sys/ioctl.h>
-#include <linux/h3600_ts.h>	/* touch screen events */
-+
-+typedef struct {
-+  unsigned short          pressure;
-+  unsigned short          x;
-+  unsigned short          y;
-+  unsigned short          pad;
-+  struct timeval  stamp;
-+} TS_EVENT;
- 
- static long lastx = 0, lasty = 0;
- int TsScreen;
- extern int TsFbdev;
- 
-void
-TsRead (int tsPort, void *closure)
-{
-    TS_EVENT	    event;
-    long	    buf[3];
-    int		    n;
-    long	    pressure;
-    long	    x, y;
-    unsigned long   flags;
-    unsigned long   buttons;
-
-    n = Ps2ReadBytes (tsPort, (char *) &event, 
-			 sizeof (event), sizeof (event));
-    if (n == sizeof (event))  
-    {
-	if (event.pressure) 
-	{
-	    /* 
-	     * HACK ATTACK.  (static global variables used !)
-	     * Here we test for the touch screen driver actually being on the
-	     * touch screen, if it is we send absolute coordinates. If not,
-	     * then we send delta's so that we can track the entire vga screen.
-	     */
-	    if (TsScreen == TsFbdev) {
-	    	flags = KD_BUTTON_1;
-	    	x = event.x;
-	    	y = event.y;
-	    } else {
-	    	flags = /* KD_BUTTON_1 |*/ KD_MOUSE_DELTA;
-	    	if ((lastx == 0) || (lasty == 0)) {
-	    	    x = 0;
-	    	    y = 0;
-	    	} else {
-	    	    x = event.x - lastx;
-	    	    y = event.y - lasty;
-	    	}
-	    	lastx = event.x;
-	    	lasty = event.y;
-	    }
-	} else {
-	    flags = KD_MOUSE_DELTA;
-	    x = 0;
-	    y = 0;
-	    lastx = 0;
-	    lasty = 0;
-	}
-	KdEnqueueMouseEvent (flags, x, y);
-+void TsRead (int tsPort, void *closure) {
-+  TS_EVENT        event;
-+  long            buf[3];
-+  int             n;
-+  long            pressure;
-+  long            x, y;
-+  unsigned long   flags;
-+  unsigned long   buttons;
-+
-+  n = Ps2ReadBytes(tsPort, (char *) &event, sizeof (event), sizeof (event));
-+  if (n >= sizeof (event)) {
-+    if (event.pressure >= 100) {
-+      flags = KD_BUTTON_1;
-+      x = (960 - event.x) * 640 / (920);
-+      y = (960 - event.y) * 480 / (920);
-+      //ErrorF("flags %d x %d y %dn",flags,event.x,event.y);
-+    }
-+    else {
-+      flags = KD_MOUSE_DELTA;
-+      x = lastx;
-+      y = lasty;
-     }
-+    KdEnqueueMouseEvent(flags, x, y);
-+  }
- }
- 
- char	*TsNames[] = {
-  "/dev/ts",	
-  "/dev/h3600_ts" /* temporary name; note this code can try
-+  "/dev/ucb1x00-ts",
-+  "/dev/ts" /* temporary name; note this code can try
- 			   to open more than one device */
- };
- 
-@@ -99,9 +82,7 @@
- 
- int TsInputType;
- 
-int
-TsInit (void)
-{
-+int TsInit (void) {
-     int	    i;
-     int	    TsPort;
- 
-diff -Nur xc-011010.src/startx xc-011010/startx
--- ../../buildroot-tux.Apr25-1/build/xc-011010.src/startx	Thu Apr 25 05:20:35 2002
-+++ xc-011010/startx	Sun Apr 28 05:35:35 2002
-@@ -0,0 +1,11 @@
-+#!/bin/sh
-+killall Xfbdev
-+sleep 1
-+export DISPLAY=":0"
-+/usr/X11R6/bin/Xfbdev -ac &
-+sleep 4
-+/usr/X11R6/bin/matchbox &
-+sleep 1
-+/usr/X11R6/bin/minisys &
-+/usr/X11R6/bin/minitime &
-+/usr/X11R6/bin/rxvt &
-diff -Nur xc-011010.src/lib/Xft/xftgram.y xc-011010/lib/Xft/xftgram.y
--- ../../buildroot-tux.Apr25-1/build/xc-011010/lib/Xft/xftgram.y	Thu Apr 25 05:20:35 2002
-+++ xc-011010/lib/Xft/xftgram.y	Sun Apr 28 05:35:35 2002
-@@ -165,6 +165,7 @@
- 		    matrix.yx = $4;
- 		    matrix.__REALLY_YY__ = $5;
- 		}
-+	;
- number	:   INTEGER
- 		{ $$ = (double) $1; }
- 	|   DOUBLE
-diff -Nur xc-011010.src/programs/twm/gram.y xc-011010/programs/twm/gram.y
--- ../../buildroot-tux.Apr25-1/build/xc-011010/programs/twm/gram.y	Thu Apr 25 05:20:35 2002
-+++ xc-011010/programs/twm/gram.y	Sun Apr 28 05:35:35 2002
-@@ -650,6 +650,7 @@
- 					  RemoveDQuote(ptr);
- 					  $$ = ptr;
- 					}
-+		;
- number		: NUMBER		{ $$ = $1; }
- 		;
- 
--- a/package/tinyx-old/tinyx-build.patch
+++ b/package/tinyx-old/tinyx-build.patch
@ -1,11 +0,0 @@
--- xc-011010/programs/xfs/os/config.c.orig	2001-07-31 18:45:05.000000000 -0600
-+++ xc-011010/programs/xfs/os/config.c	2005-05-12 15:51:35.000000000 -0600
-@@ -661,6 +661,8 @@
-     val = config_parse_int (val, &ret, &scan);
-     if (ret == -1)
- 	return val;
-+#ifdef SNFFORMAT
-     SnfSetFormat (bit, byte, glyph, scan);
-+#endif
-     return val;
- }
--- a/package/tinyx-old/tinyx-config.patch
+++ b/package/tinyx-old/tinyx-config.patch
@ -1,112 +0,0 @@
--- xc/config/cf/host.def~	2005-04-02 14:51:31.000000000 -0700
-+++ xc/config/cf/host.def	2005-04-26 01:22:00.000000000 -0600
-@@ -0,0 +1,36 @@
-+#define KDriveXServer		YES
-+#define TinyXServer		YES
-+#define XfbdevServer		YES
-+#define CrossCompiling		YES
-+#define ProjectRoot             /usr/X11R6
-+#define NothingOutsideProjectRoot	YES
-+
-+#define HasFreetype2		NO
-+#define HasFontconfig		NO
-+#define HasLibpng		YES
-+#define HasZlib			YES
-+
-+#define HasExpat		NO
-+#define XprtServer		NO
-+#define BuildXprintClients	NO
-+#define TouchScreen		NO
-+#define HasTsLib		NO
-+#define BuildDocs		NO
-+#define BuildXF86DRI		NO
-+#define BuildGlxExt		NO
-+#define BuildOSMesaLib		NO
-+#define BuildLBX		NO
-+#define BuildLowMem		NO
-+#define BuildIPv6		NO
-+
-+/*
-+#define XF86CardDrivers		mga glint nv tga s3virge sis rendition \
-+				neomagic i740 tdfx savage \
-+				cirrus vmware tseng trident chips apm \
-+				GlideDriver fbdev i128 \
-+				ati AgpGartDrivers DevelDrivers ark \
-+				cyrix siliconmotion vesa vga \
-+				XF86OSCardDrivers XF86ExtraCardDrivers
-+*/
-+
-+#define XInputDrivers		mouse keyboard
--- xc/config/cf/cross.def.orig	2001-03-29 19:15:17.000000000 -0700
-+++ xc/config/cf/cross.def	2005-05-12 16:09:23.000000000 -0600
-@@ -5,34 +5,56 @@
-  * compiler images.  It will have to be edited to reflect these
-  * given your local configuration.
-  */
-+
-+#undef Arm32Architecture
- #undef i386Architecture
-+#undef Arm32Architecture
-+#undef Arm32Architecture
-+
-+#if defined(__arm__)
- #define Arm32Architecture
-+#endif
-+#if defined(__i386__)
-+#defined i386Architecture
-+#endif
-+#if defined(__mc68000__)
-+#define Mc68020Architecture
-+#endif
-+#if defined(__mips__)
-+#define MipsArchitecture
-+#endif
-+#if defined(__powerpc__)
-+#define PpcArchitecture
-+#endif
- 
- #undef OptimizedCDebugFlags
-#define OptimizedCDebugFlags 	-O2
-#define ServerCDebugFlags	-O2
-+#define OptimizedCDebugFlags 	-Os
-+#define ServerCDebugFlags	-Os
- #undef StandardDefines
-#define StandardDefines 	-Dlinux -D__arm__ -D_POSIX_SOURCE \
-				-D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
-#undef CcCmd
-#define StdIncDir /skiff/local/arm-linux/include
-#define PreIncDir 
-+#define StandardDefines 	-Dlinux -D__REPLACE_ARCH__ -D_POSIX_SOURCE \
-+  				-D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
-+#define StdIncDir REPLACE_STAGING_DIR/include
-+#define PreIncDir
- #undef PostIncDir
-#define PostIncDir /skiff/local/lib/gcc-lib/arm-linux/2.95.2/include
-#define CcCmd /skiff/local/bin/arm-linux-gcc
-+#define PostIncDir REPLACE_STAGING_DIR/lib/gcc-lib/REPLACE_ARCH-linux-uclibc/3.3.3/include
-+#undef CcCmd
-+#define CcCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-gcc
-+#undef HasCplusplus
-+#define HasCplusplus NO
- #undef CplusplusCmd
-#define HasCplusplus YES
-#define CplusplusCmd /skiff/local/bin/arm-linux-g++
-+#define CplusplusCmd NO
- #define DoRanlibCmd YES
-#define RanlibCmd /skiff/local/bin/arm-linux-ranlib
-+#define RanlibCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-ranlib
- #undef ExtraLoadFlags
- #define ExtraLoadFlags
- #define FbNoPixelAddrCode
- #undef TermcapLibrary
-#define TermcapLibrary -ltermcap
-+#define TermcapLibrary -lncurses
- 
- #undef LdPostLib
-#define LdPostLib	-L/skiff/local/arm-linux/lib
-+#define LdPostLib	-LREPLACE_STAGING_DIR/REPLACE_ARCH-linux-uclibc/lib
-+#undef LdCmd
-+#define LdCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-ld
- 
- #undef ExtensionOSDefines
- #define ExtensionOSDefines
--- a/package/tinyx-old/tinyx.mk
+++ b/package/tinyx-old/tinyx.mk
@ -1,156 +0,0 @@
-#############################################################
-#
-# tinyx - a small footprint X-server for the TuxScreen
-#
-#############################################################
-# Copyright (C) 2002 by Tom Walsh <Tom@OpenHardware.net>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Library General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
-#
-
-
-ifneq ($(strip $(BR2_PACKAGE_XORG)),y)
-ifeq ($(strip $(BR2_PACKAGE_TINYX_OLD)),y)
-
-#############################################################
-# You may want to change these.
-#############################################################
-
-TINYX_APPS:=xlsfonts/xlsfonts xmodmap/xmodmap
-#xset/xset xdpyinfo/xdpyinfo xsetroot/xsetroot \
-# xrdb/xrdb xrandr/xrandr \
-# xhost/xhost xauth/xauth oclock/oclock xeyes/xeyes
-#
-
-TINYX_LIBS:=ICE X11 Xext Xpm
-# Xaw SM Xt Xmu
-
-#############################################################
-# Stuff below this line shouldn't need changes.
-# if you do change, look in rxvt & matchbox for the impact!
-#############################################################
-#
-# Where resources are found.
-#
-
-TINYX_DIR:=$(BUILD_DIR)/xc-011010
-TINYX_LDIR:=$(TINYX_DIR)/lib
-TINYX_PROGS:=$(TINYX_DIR)/programs
-TINYX_SOURCE:=xc-011010.tar.bz2
-TINYX_SITE:= http://intimate.handhelds.org/jacques/
-TINYX_CF:=$(TINYX_DIR)/config/cf
-#
-# Some things that you may want to change.
-TINYX_XFBDEV:=$(TINYX_DIR)/programs/Xserver/Xfbdev
-TINYX_CAT:=$(BZCAT)
-TINYX_BINX:=$(TARGET_DIR)/usr/X11R6/bin/
-TINYX_LIBX:=$(TARGET_DIR)/usr/lib/
-
-#
-# These rules fetch various tinyx source files.
-#
-$(DL_DIR)/$(TINYX_SOURCE):
-	$(WGET) -P $(DL_DIR) $(TINYX_SITE)/$(TINYX_SOURCE)
-
-#
-# rule to make sure that we have the source, and it is configured.
-#
-$(TINYX_DIR)/.configure: $(DL_DIR)/$(TINYX_SOURCE)
-	$(TINYX_CAT) $(DL_DIR)/$(TINYX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(TINYX_DIR) package/tinyx/ tinyx\*.patch
-	$(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(TINYX_CF)/cross.def
-	$(SED) 's:REPLACE_ARCH:$(ARCH):g' $(TINYX_CF)/cross.def
-	$(SED) 's:#define CcCmd.*:#define CcCmd $(TARGET_CROSS)gcc:g' $(TINYX_CF)/cross.def
-	$(SED) 's:#define RanlibCmd.*:#define RanlibCmd $(TARGET_CROSS)ranlib:g' $(TINYX_CF)/cross.def
-	$(SED) 's:#define LdCmd.*:#define LdCmd $(TARGET_CROSS)ld:g' $(TINYX_CF)/cross.def
-	touch $(TINYX_DIR)/.configure
-
-#
-# Now that we have the source, build it...
-#
-$(TINYX_XFBDEV): $(TINYX_DIR)/.configure
-	rm -f $(TINYX_BINX)/Xfbdev
-	#make World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=<cross compiler dir>"
-	#( cd $(TINYX_DIR); $(MAKE) World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=$(STAGING_DIR)/bin" )
-	#( cd $(TINYX_DIR); $(TARGET_CONFIGURE_OPTS) $(MAKE) World )
-	#
-	#mv $(TINYX_DIR)/Makefile $(TINYX_DIR)/Makefile.xxxx
-	#echo "AS=$(TARGET_CROSS)as" > $(TINYX_DIR)/Makefile
-	#echo "LD=$(TARGET_CROSS)ld" >> $(TINYX_DIR)/Makefile
-	#echo "NM=$(TARGET_CROSS)nm" >> $(TINYX_DIR)/Makefile
-	#echo "CC=$(TARGET_CROSS)gcc" >> $(TINYX_DIR)/Makefile
-	#echo "GCC=$(TARGET_CROSS)gcc" >> $(TINYX_DIR)/Makefile
-	#echo "CXX=$(TARGET_CROSS)g++" >> $(TINYX_DIR)/Makefile
-	#echo "RANLIB=$(TARGET_CROSS)ranlib" >> $(TINYX_DIR)/Makefile
-	#echo "OBJCOPY=$(TARGET_CROSS)objcopy" >> $(TINYX_DIR)/Makefile
-	#cat $(TINYX_DIR)/Makefile.xxxx >> $(TINYX_DIR)/Makefile
-	( cd $(TINYX_DIR); $(MAKE) World )
-
-#
-# Install x-includes and x-libraries in $(STAGING_DIR)/usr/X11R6/
-# and add a symbolic link between /usr/bin/X11 and /usr/X11R6/bin
-$(STAGING_DIR)/usr/X11R6/lib/libX11.so.6.2: $(TINYX_XFBDEV)
-	mkdir -p $(STAGING_DIR)/usr/X11R6/lib
-	mkdir -p $(STAGING_DIR)/usr/X11R6/include
-	cp -fRL $(TINYX_DIR)/exports/include/* $(STAGING_DIR)/usr/X11R6/include/
-	cp -fRL $(TINYX_DIR)/exports/lib/* $(STAGING_DIR)/usr/X11R6/lib/
-	ln -s /usr/X11R6/bin $(TARGET_DIR)/usr/bin/X11
-
-#
-# Once Frame Buffer is built, we install executables.
-$(TINYX_BINX)/Xfbdev: $(TINYX_XFBDEV)
-	-mkdir $(TARGET_DIR)/usr/X11R6
-	-mkdir $(TINYX_BINX)
-	for file in $(TINYX_APPS); do \
-		cp -f $(TINYX_DIR)/programs/$$file $(TINYX_BINX); \
-		$(STRIPCMD) $(TINYX_PROGS)/$$file; \
-	done
-	cp $(TINYX_DIR)/programs/Xserver/Xfbdev $(TINYX_BINX)
-	$(STRIPCMD) $(TINYX_BINX)/Xfbdev
-	cp -f $(TINYX_DIR)/startx $(TARGET_DIR)/bin
-	chmod a+x $(TARGET_DIR)/bin/startx
-
-#
-# After we have executables installed, install the libraries.
-$(TINYX_LIBX)/libX11.so.6.2: $(TINYX_XFBDEV)
-	for dirs in $(TINYX_LIBS); do \
-		file=`find $(TINYX_LDIR)/$$dirs -type f -iname "lib$$dirs.so*"`; \
-		$(STRIPCMD) --strip-unneeded $$file; \
-		cp -f $$file $(TINYX_LIBX); \
-		file=`find $(TINYX_LDIR)/$$dirs -type l -iname "lib$$dirs.so*"`; \
-		cp -pRf $$file $(TINYX_LIBX); \
-	done
-
-tinyx: zlib $(STAGING_DIR)/usr/X11R6/lib/libX11.so.6.2 \
-	$(TINYX_LIBX)/libX11.so.6.2 $(TINYX_BINX)/Xfbdev
-
-tinyx-source: $(DL_DIR)/$(TINYX_SOURCE)
-
-tinyx-clean:
-	-rm -rf $(TARGET_DIR)/usr/X11R6
-	-$(MAKE) -C $(TINYX_DIR) clean
-
-tinyx-dirclean:
-	-rm -rf $(TINYX_DIR)
-	-rm -rf $(TARGET_DIR)/usr/X11R6
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-TARGETS+=tinyx
-endif
-endif
--- a/package/tinyx/Config.in
+++ b/package/tinyx/Config.in
@ -1,11 +0,0 @@
-config BR2_PACKAGE_TINYX
-	bool "tinyx"
-	default y if BR2_PACKAGE_XSERVER_tinyx
-	select BR2_USE_WCHAR
-	select BR2_ENABLE_LOCALE
-	help
-	  A tiny X server.  Also known as 'Xfbdev' and 'kdrive'.
-
-comment "tinyx X Window System disabled"
-	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
-
--- a/package/tinyx/tinyx-011010-MB_CUR_MAX.patch
+++ b/package/tinyx/tinyx-011010-MB_CUR_MAX.patch
@ -1,11 +0,0 @@
-diff -urN xc-011010-0rig/lib/X11/lcGenConv.c xc-011010/lib/X11/lcGenConv.c
--- xc-011010-0rig/lib/X11/lcGenConv.c	2001-08-15 13:54:21.000000000 +0200
-+++ xc-011010/lib/X11/lcGenConv.c	2007-08-13 12:55:18.000000000 +0200
-@@ -48,6 +48,7 @@
-  * Platforms: all systems.
-  */
- 
-+#include <stdlib.h>
- #include "Xlibint.h"
- #include "XlcGeneric.h"
- #include <stdio.h>
--- a/package/tinyx/tinyx-011010-strings.patch
+++ b/package/tinyx/tinyx-011010-strings.patch
@ -1,13 +0,0 @@
-diff -urN xc-011010-0rig/include/Xfuncs.h xc-011010/include/Xfuncs.h
--- xc-011010-0rig/include/Xfuncs.h	2001-07-25 17:04:42.000000000 +0200
-+++ xc-011010/include/Xfuncs.h	2007-08-13 13:08:39.000000000 +0200
-@@ -45,6 +45,9 @@
- #include <strings.h>
- /* bcopy, bcmp, bzero declared */
- #define _XFUNCS_H_INCLUDED_STRING_H
-+#elif defined(__UCLIBC__)
-+#include <string.h>
-+#define _XFUNCS_H_INCLUDED_STRING_H
- #else
- #include <string.h>
- #define _XFUNCS_H_INCLUDED_STRING_H
--- a/package/tinyx/tinyx-011010.patch
+++ b/package/tinyx/tinyx-011010.patch
@ -1,195 +0,0 @@
--- xc-011010/config/cf/X11.tmpl.orig	2005-05-12 16:16:17.000000000 -0600
-+++ xc-011010/config/cf/X11.tmpl	2005-05-12 16:16:23.000000000 -0600
-@@ -3055,7 +3055,7 @@
- 	$(RM) index.raw file.nPS file.PS file.txt
- #endif
- 
-#ifndef MakeSimpleDoc(file,srcs)
-+#ifndef MakeSimpleDoc
- #define MakeSimpleDoc(file,srcs) MakeDepSimpleDoc(file,srcs,srcs)
- #endif
- 
--- xc-011010/config/cf/kdrive.cf.orig	2005-05-12 16:14:50.000000000 -0600
-+++ xc-011010/config/cf/kdrive.cf	2005-05-12 16:15:03.000000000 -0600
-@@ -201,7 +201,7 @@
- #undef ServerOSDefines
- #define ServerOSDefines -DDDXOSINIT
- 
-#ifndef Other IConfigFiles
-+#ifndef OtherIConfigFiles
- #define OtherIConfigFile $(IRULESRC)/kdrive.cf
- #endif
- 
-diff -Nur --exclude=CVS xc-011010.src/include/extensions/lbxstr.h xc-011010/include/extensions/lbxstr.h
--- xc-011010.src/include/extensions/lbxstr.h	Tue Jul 31 20:44:35 2001
-+++ xc-011010/include/extensions/lbxstr.h	Sun Apr 21 12:35:05 2002
-@@ -25,7 +25,7 @@
- #ifndef _LBXSTR_H_
- #define _LBXSTR_H_
- 
-#include <X11/extensions/XLbx.h>
-+#include "XLbx.h"
- 
- #define LBXNAME "LBX"
- 
-diff -Nur --exclude=CVS xc-011010.src/programs/Xserver/hw/kdrive/fbdev/fbdev.h xc-011010/programs/Xserver/hw/kdrive/fbdev/fbdev.h
--- xc-011010.src/programs/Xserver/hw/kdrive/fbdev/fbdev.h	Sun Jun  3 17:52:45 2001
-+++ xc-011010/programs/Xserver/hw/kdrive/fbdev/fbdev.h	Sun Apr 21 12:36:25 2002
-@@ -29,6 +29,7 @@
- #include <linux/fb.h>
- #include <unistd.h>
- #include <sys/mman.h>
-+#include <sys/types.h>
- #include "kdrive.h"
- #include "layer.h"
-
-diff -Nur xc-011010.src2/lib/X11/Xlib.h xc-011010/lib/X11/Xlib.h
--- xc-011010.src/programs/Xserver/hw/kdrive/linux/ts.c	Tue Jul 10 22:58:19 2001
-+++ xc-011010/programs/Xserver/hw/kdrive/linux/ts.c	Tue Apr 23 20:16:23 2002
-@@ -33,65 +33,48 @@
- #include "kdrive.h"
- #include "Xpoll.h"
- #include <sys/ioctl.h>
-#include <linux/h3600_ts.h>	/* touch screen events */
-+
-+typedef struct {
-+  unsigned short          pressure;
-+  unsigned short          x;
-+  unsigned short          y;
-+  unsigned short          pad;
-+  struct timeval  stamp;
-+} TS_EVENT;
- 
- static long lastx = 0, lasty = 0;
- int TsScreen;
- extern int TsFbdev;
- 
-void
-TsRead (int tsPort, void *closure)
-{
-    TS_EVENT	    event;
-    long	    buf[3];
-    int		    n;
-    long	    pressure;
-    long	    x, y;
-    unsigned long   flags;
-    unsigned long   buttons;
-
-    n = Ps2ReadBytes (tsPort, (char *) &event, 
-			 sizeof (event), sizeof (event));
-    if (n == sizeof (event))  
-    {
-	if (event.pressure) 
-	{
-	    /* 
-	     * HACK ATTACK.  (static global variables used !)
-	     * Here we test for the touch screen driver actually being on the
-	     * touch screen, if it is we send absolute coordinates. If not,
-	     * then we send delta's so that we can track the entire vga screen.
-	     */
-	    if (TsScreen == TsFbdev) {
-	    	flags = KD_BUTTON_1;
-	    	x = event.x;
-	    	y = event.y;
-	    } else {
-	    	flags = /* KD_BUTTON_1 |*/ KD_MOUSE_DELTA;
-	    	if ((lastx == 0) || (lasty == 0)) {
-	    	    x = 0;
-	    	    y = 0;
-	    	} else {
-	    	    x = event.x - lastx;
-	    	    y = event.y - lasty;
-	    	}
-	    	lastx = event.x;
-	    	lasty = event.y;
-	    }
-	} else {
-	    flags = KD_MOUSE_DELTA;
-	    x = 0;
-	    y = 0;
-	    lastx = 0;
-	    lasty = 0;
-	}
-	KdEnqueueMouseEvent (flags, x, y);
-+void TsRead (int tsPort, void *closure) {
-+  TS_EVENT        event;
-+  long            buf[3];
-+  int             n;
-+  long            pressure;
-+  long            x, y;
-+  unsigned long   flags;
-+  unsigned long   buttons;
-+
-+  n = Ps2ReadBytes(tsPort, (char *) &event, sizeof (event), sizeof (event));
-+  if (n >= sizeof (event)) {
-+    if (event.pressure >= 100) {
-+      flags = KD_BUTTON_1;
-+      x = (960 - event.x) * 640 / (920);
-+      y = (960 - event.y) * 480 / (920);
-+      //ErrorF("flags %d x %d y %dn",flags,event.x,event.y);
-+    }
-+    else {
-+      flags = KD_MOUSE_DELTA;
-+      x = lastx;
-+      y = lasty;
-     }
-+    KdEnqueueMouseEvent(flags, x, y);
-+  }
- }
- 
- char	*TsNames[] = {
-  "/dev/ts",	
-  "/dev/h3600_ts" /* temporary name; note this code can try
-+  "/dev/ucb1x00-ts",
-+  "/dev/ts" /* temporary name; note this code can try
- 			   to open more than one device */
- };
- 
-@@ -99,9 +82,7 @@
- 
- int TsInputType;
- 
-int
-TsInit (void)
-{
-+int TsInit (void) {
-     int	    i;
-     int	    TsPort;
- 
-diff -Nur xc-011010.src/startx xc-011010/startx
--- ../../buildroot-tux.Apr25-1/build/xc-011010.src/startx	Thu Apr 25 05:20:35 2002
-+++ xc-011010/startx	Sun Apr 28 05:35:35 2002
-@@ -0,0 +1,11 @@
-+#!/bin/sh
-+killall Xfbdev
-+sleep 1
-+export DISPLAY=":0"
-+/usr/X11R6/bin/Xfbdev -ac &
-+sleep 4
-+/usr/X11R6/bin/matchbox &
-+sleep 1
-+/usr/X11R6/bin/minisys &
-+/usr/X11R6/bin/minitime &
-+/usr/X11R6/bin/rxvt &
-diff -Nur xc-011010.src/lib/Xft/xftgram.y xc-011010/lib/Xft/xftgram.y
--- ../../buildroot-tux.Apr25-1/build/xc-011010/lib/Xft/xftgram.y	Thu Apr 25 05:20:35 2002
-+++ xc-011010/lib/Xft/xftgram.y	Sun Apr 28 05:35:35 2002
-@@ -165,6 +165,7 @@
- 		    matrix.yx = $4;
- 		    matrix.__REALLY_YY__ = $5;
- 		}
-+	;
- number	:   INTEGER
- 		{ $$ = (double) $1; }
- 	|   DOUBLE
-diff -Nur xc-011010.src/programs/twm/gram.y xc-011010/programs/twm/gram.y
--- ../../buildroot-tux.Apr25-1/build/xc-011010/programs/twm/gram.y	Thu Apr 25 05:20:35 2002
-+++ xc-011010/programs/twm/gram.y	Sun Apr 28 05:35:35 2002
-@@ -650,6 +650,7 @@
- 					  RemoveDQuote(ptr);
- 					  $$ = ptr;
- 					}
-+		;
- number		: NUMBER		{ $$ = $1; }
- 		;
- 
--- a/package/tinyx/tinyx-build.patch
+++ b/package/tinyx/tinyx-build.patch
@ -1,11 +0,0 @@
--- xc-011010/programs/xfs/os/config.c.orig	2001-07-31 18:45:05.000000000 -0600
-+++ xc-011010/programs/xfs/os/config.c	2005-05-12 15:51:35.000000000 -0600
-@@ -661,6 +661,8 @@
-     val = config_parse_int (val, &ret, &scan);
-     if (ret == -1)
- 	return val;
-+#ifdef SNFFORMAT
-     SnfSetFormat (bit, byte, glyph, scan);
-+#endif
-     return val;
- }
--- a/package/tinyx/tinyx-config.patch
+++ b/package/tinyx/tinyx-config.patch
@ -1,112 +0,0 @@
--- xc/config/cf/host.def~	2005-04-02 14:51:31.000000000 -0700
-+++ xc/config/cf/host.def	2005-04-26 01:22:00.000000000 -0600
-@@ -0,0 +1,36 @@
-+#define KDriveXServer		YES
-+#define TinyXServer		YES
-+#define XfbdevServer		YES
-+#define CrossCompiling		YES
-+#define ProjectRoot             /usr/X11R6
-+#define NothingOutsideProjectRoot	YES
-+
-+#define HasFreetype2		NO
-+#define HasFontconfig		NO
-+#define HasLibpng		YES
-+#define HasZlib			YES
-+
-+#define HasExpat		NO
-+#define XprtServer		NO
-+#define BuildXprintClients	NO
-+#define TouchScreen		NO
-+#define HasTsLib		NO
-+#define BuildDocs		NO
-+#define BuildXF86DRI		NO
-+#define BuildGlxExt		NO
-+#define BuildOSMesaLib		NO
-+#define BuildLBX		NO
-+#define BuildLowMem		NO
-+#define BuildIPv6		NO
-+
-+/*
-+#define XF86CardDrivers		mga glint nv tga s3virge sis rendition \
-+				neomagic i740 tdfx savage \
-+				cirrus vmware tseng trident chips apm \
-+				GlideDriver fbdev i128 \
-+				ati AgpGartDrivers DevelDrivers ark \
-+				cyrix siliconmotion vesa vga \
-+				XF86OSCardDrivers XF86ExtraCardDrivers
-+*/
-+
-+#define XInputDrivers		mouse keyboard
--- xc/config/cf/cross.def.orig	2001-03-29 19:15:17.000000000 -0700
-+++ xc/config/cf/cross.def	2005-05-12 16:09:23.000000000 -0600
-@@ -5,34 +5,56 @@
-  * compiler images.  It will have to be edited to reflect these
-  * given your local configuration.
-  */
-+
-+#undef Arm32Architecture
- #undef i386Architecture
-+#undef Arm32Architecture
-+#undef Arm32Architecture
-+
-+#if defined(__arm__)
- #define Arm32Architecture
-+#endif
-+#if defined(__i386__)
-+#defined i386Architecture
-+#endif
-+#if defined(__mc68000__)
-+#define Mc68020Architecture
-+#endif
-+#if defined(__mips__)
-+#define MipsArchitecture
-+#endif
-+#if defined(__powerpc__)
-+#define PpcArchitecture
-+#endif
- 
- #undef OptimizedCDebugFlags
-#define OptimizedCDebugFlags 	-O2
-#define ServerCDebugFlags	-O2
-+#define OptimizedCDebugFlags 	-Os
-+#define ServerCDebugFlags	-Os
- #undef StandardDefines
-#define StandardDefines 	-Dlinux -D__arm__ -D_POSIX_SOURCE \
-				-D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
-#undef CcCmd
-#define StdIncDir /skiff/local/arm-linux/include
-#define PreIncDir 
-+#define StandardDefines 	-Dlinux -D__REPLACE_ARCH__ -D_POSIX_SOURCE \
-+  				-D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
-+#define StdIncDir REPLACE_STAGING_DIR/include
-+#define PreIncDir
- #undef PostIncDir
-#define PostIncDir /skiff/local/lib/gcc-lib/arm-linux/2.95.2/include
-#define CcCmd /skiff/local/bin/arm-linux-gcc
-+#define PostIncDir REPLACE_STAGING_DIR/lib/gcc-lib/REPLACE_ARCH-linux-uclibc/3.3.3/include
-+#undef CcCmd
-+#define CcCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-gcc
-+#undef HasCplusplus
-+#define HasCplusplus NO
- #undef CplusplusCmd
-#define HasCplusplus YES
-#define CplusplusCmd /skiff/local/bin/arm-linux-g++
-+#define CplusplusCmd NO
- #define DoRanlibCmd YES
-#define RanlibCmd /skiff/local/bin/arm-linux-ranlib
-+#define RanlibCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-ranlib
- #undef ExtraLoadFlags
- #define ExtraLoadFlags
- #define FbNoPixelAddrCode
- #undef TermcapLibrary
-#define TermcapLibrary -ltermcap
-+#define TermcapLibrary -lncurses
- 
- #undef LdPostLib
-#define LdPostLib	-L/skiff/local/arm-linux/lib
-+#define LdPostLib	-LREPLACE_STAGING_DIR/REPLACE_ARCH-linux-uclibc/lib
-+#undef LdCmd
-+#define LdCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-ld
- 
- #undef ExtensionOSDefines
- #define ExtensionOSDefines
--- a/package/tinyx/tinyx.mk
+++ b/package/tinyx/tinyx.mk
@ -1,157 +0,0 @@
-#############################################################
-#
-# tinyx - a small footprint X-server for the TuxScreen
-#
-#############################################################
-# Copyright (C) 2002 by Tom Walsh <Tom@OpenHardware.net>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Library General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
-#
-
-
-ifneq ($(strip $(BR2_PACKAGE_XORG)),y)
-ifeq ($(strip $(BR2_PACKAGE_TINYX)),y)
-ifeq ($(strip $(BR2_PACKAGE_TINYX_OLD)),y)
-#############################################################
-# You may want to change these.
-#############################################################
-
-TINYX_APPS:=xlsfonts/xlsfonts xmodmap/xmodmap
-#xset/xset xdpyinfo/xdpyinfo xsetroot/xsetroot \
-# xrdb/xrdb xrandr/xrandr \
-# xhost/xhost xauth/xauth oclock/oclock xeyes/xeyes
-#
-
-TINYX_LIBS:=ICE X11 Xext Xpm
-# Xaw SM Xt Xmu
-
-#############################################################
-# Stuff below this line shouldn't need changes.
-# if you do change, look in rxvt & matchbox for the impact!
-#############################################################
-#
-# Where resources are found.
-#
-TINYX_VERSION:=011010
-TINYX_DIR:=$(BUILD_DIR)/xc-$(TINYX_VERSION)
-TINYX_LDIR:=$(TINYX_DIR)/lib
-TINYX_PROGS:=$(TINYX_DIR)/programs
-TINYX_SOURCE:=xc-$(TINYX_VERSION).tar.bz2
-TINYX_SITE:= http://intimate.handhelds.org/jacques/
-TINYX_CF:=$(TINYX_DIR)/config/cf
-#
-# Some things that you may want to change.
-TINYX_XFBDEV:=$(TINYX_DIR)/programs/Xserver/Xfbdev
-TINYX_CAT:=$(BZCAT)
-TINYX_BINX:=$(TARGET_DIR)/usr/X11R6/bin/
-TINYX_LIBX:=$(TARGET_DIR)/usr/lib/
-
-#
-# These rules fetch various tinyx source files.
-#
-$(DL_DIR)/$(TINYX_SOURCE):
-	$(WGET) -P $(DL_DIR) $(TINYX_SITE)/$(TINYX_SOURCE)
-
-#
-# rule to make sure that we have the source, and it is configured.
-#
-$(TINYX_DIR)/.configure: $(DL_DIR)/$(TINYX_SOURCE)
-	$(TINYX_CAT) $(DL_DIR)/$(TINYX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(TINYX_DIR) package/tinyx/ tinyx\*.patch
-	$(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(TINYX_CF)/cross.def
-	$(SED) 's:REPLACE_ARCH:$(ARCH):g' $(TINYX_CF)/cross.def
-	$(SED) 's:#define CcCmd.*:#define CcCmd $(TARGET_CROSS)gcc:g' $(TINYX_CF)/cross.def
-	$(SED) 's:#define RanlibCmd.*:#define RanlibCmd $(TARGET_CROSS)ranlib:g' $(TINYX_CF)/cross.def
-	$(SED) 's:#define LdCmd.*:#define LdCmd $(TARGET_CROSS)ld:g' $(TINYX_CF)/cross.def
-	touch $(TINYX_DIR)/.configure
-
-#
-# Now that we have the source, build it...
-#
-$(TINYX_XFBDEV): $(TINYX_DIR)/.configure
-	rm -f $(TINYX_BINX)/Xfbdev
-	#make World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=<cross compiler dir>"
-	#( cd $(TINYX_DIR); $(MAKE) World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=$(STAGING_DIR)/bin" )
-	#( cd $(TINYX_DIR); $(MAKE) $(TARGET_CONFIGURE_OPTS) World )
-	#
-	#mv $(TINYX_DIR)/Makefile $(TINYX_DIR)/Makefile.xxxx
-	#echo "AS=$(TARGET_CROSS)as" > $(TINYX_DIR)/Makefile
-	#echo "LD=$(TARGET_CROSS)ld" >> $(TINYX_DIR)/Makefile
-	#echo "NM=$(TARGET_CROSS)nm" >> $(TINYX_DIR)/Makefile
-	#echo "CC=$(TARGET_CROSS)gcc" >> $(TINYX_DIR)/Makefile
-	#echo "GCC=$(TARGET_CROSS)gcc" >> $(TINYX_DIR)/Makefile
-	#echo "CXX=$(TARGET_CROSS)g++" >> $(TINYX_DIR)/Makefile
-	#echo "RANLIB=$(TARGET_CROSS)ranlib" >> $(TINYX_DIR)/Makefile
-	#echo "OBJCOPY=$(TARGET_CROSS)objcopy" >> $(TINYX_DIR)/Makefile
-	#cat $(TINYX_DIR)/Makefile.xxxx >> $(TINYX_DIR)/Makefile
-	( cd $(TINYX_DIR); $(MAKE) $(TARGET_CONFIGURE_OPTS) World )
-
-#
-# Install x-includes and x-libraries in $(STAGING_DIR)/usr/X11R6/
-# and add a symbolic link between /usr/bin/X11 and /usr/X11R6/bin
-$(STAGING_DIR)/usr/X11R6/lib/libX11.so.6.2: $(TINYX_XFBDEV)
-	mkdir -p $(STAGING_DIR)/usr/X11R6/lib
-	mkdir -p $(STAGING_DIR)/usr/X11R6/include
-	cp -fRL $(TINYX_DIR)/exports/include/* $(STAGING_DIR)/usr/X11R6/include/
-	cp -fRL $(TINYX_DIR)/exports/lib/* $(STAGING_DIR)/usr/X11R6/lib/
-	ln -s /usr/X11R6/bin $(TARGET_DIR)/usr/bin/X11
-
-#
-# Once Frame Buffer is built, we install executables.
-$(TINYX_BINX)/Xfbdev: $(TINYX_XFBDEV)
-	-mkdir $(TARGET_DIR)/usr/X11R6
-	-mkdir $(TINYX_BINX)
-	for file in $(TINYX_APPS); do \
-		cp -f $(TINYX_DIR)/programs/$$file $(TINYX_BINX); \
-		$(STRIPCMD) $(TINYX_PROGS)/$$file; \
-	done
-	cp $(TINYX_DIR)/programs/Xserver/Xfbdev $(TINYX_BINX)
-	$(STRIPCMD) $(TINYX_BINX)/Xfbdev
-	cp -f $(TINYX_DIR)/startx $(TARGET_DIR)/bin
-	chmod a+x $(TARGET_DIR)/bin/startx
-
-#
-# After we have executables installed, install the libraries.
-$(TINYX_LIBX)/libX11.so.6.2: $(TINYX_XFBDEV)
-	for dirs in $(TINYX_LIBS); do \
-		file=`find $(TINYX_LDIR)/$$dirs -type f -iname "lib$$dirs.so*"`; \
-		$(STRIPCMD) --strip-unneeded $$file; \
-		cp -f $$file $(TINYX_LIBX); \
-		file=`find $(TINYX_LDIR)/$$dirs -type l -iname "lib$$dirs.so*"`; \
-		cp -pRf $$file $(TINYX_LIBX); \
-	done
-
-tinyx: zlib $(STAGING_DIR)/usr/X11R6/lib/libX11.so.6.2 \
-	$(TINYX_LIBX)/libX11.so.6.2 $(TINYX_BINX)/Xfbdev
-
-tinyx-source: $(DL_DIR)/$(TINYX_SOURCE)
-
-tinyx-clean:
-	-rm -rf $(TARGET_DIR)/usr/X11R6
-	-$(MAKE) -C $(TINYX_DIR) clean
-
-tinyx-dirclean:
-	-rm -rf $(TINYX_DIR)
-	-rm -rf $(TARGET_DIR)/usr/X11R6
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-TARGETS+=tinyx
-endif
-endif
-endif
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@ -152,6 +152,7 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xapp_xwininfo/Config.in
 		source package/x11r7/xapp_xwud/Config.in
 	endmenu
+	if BR2_PACKAGE_XSERVER_xorg
 	menu "X11R7 Drivers"
 		source package/x11r7/openchrome/Config.in
 		source package/x11r7/xdriver_xf86-input-acecad/Config.in
@ -178,6 +179,7 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xdriver_xf86-input-penmount/Config.in
 		source package/x11r7/xdriver_xf86-input-spaceorb/Config.in
 		source package/x11r7/xdriver_xf86-input-summa/Config.in
+		source package/x11r7/xdriver_xf86-input-synaptics/Config.in
 		source package/x11r7/xdriver_xf86-input-tek4957/Config.in
 		source package/x11r7/xdriver_xf86-input-ur98/Config.in
 		source package/x11r7/xdriver_xf86-input-vmmouse/Config.in
@ -227,6 +229,7 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xdriver_xf86-video-vmware/Config.in
 		source package/x11r7/xdriver_xf86-video-voodoo/Config.in
 	endmenu
+	endif
 	menu "X11R7 Fonts"
 		source package/x11r7/xfont_font-util/Config.in
 		source package/x11r7/xfont_encodings/Config.in
@ -311,7 +314,6 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xdata_xbitmaps/Config.in
 		source package/x11r7/xdata_xcursor-themes/Config.in
 		source package/x11r7/xkeyboard-config/Config.in
-		source package/x11r7/xdata_xkbdata/Config.in
 	endmenu
 endif

--- a/package/x11r7/mcookie/mcookie.c
+++ b/package/x11r7/mcookie/mcookie.c
--- a/package/x11r7/mcookie/mcookie.mk
+++ b/package/x11r7/mcookie/mcookie.mk
@ -4,8 +4,8 @@
 #
 #############################################################

-$(TARGET_DIR)/usr/bin/mcookie: package/xorg/mcookie.c
-	$(TARGET_CC) -Wall -Os -s package/xorg/mcookie.c -o $(TARGET_DIR)/usr/bin/mcookie
+$(TARGET_DIR)/usr/bin/mcookie: package/x11r7/mcookie/mcookie.c
+	$(TARGET_CC) -Wall -Os -s package/x11r7/mcookie/mcookie.c -o $(TARGET_DIR)/usr/bin/mcookie


 mcookie: $(TARGET_DIR)/usr/bin/mcookie
--- a/package/x11r7/openchrome/openchrome-0.2.902-cross-compile.patch
+++ b/package/x11r7/openchrome/openchrome-0.2.902-cross-compile.patch
@ -1,7 +1,7 @@
--- openchrome-r355/configure.ac.orig	2007-06-10 15:07:43.000000000 +0200
-+++ openchrome-r355/configure.ac	2007-06-10 15:11:16.000000000 +0200
-@@ -69,12 +69,18 @@
- AC_HEADER_STDC
+--- a/configure.ac	2008-04-09 15:42:55.000000000 -0400
+++ b/configure.ac	2008-06-23 09:39:06.000000000 -0400
+@@ -87,12 +87,18 @@ if test x$XSERVER_LIBPCIACCESS = xyes; t
+ fi
 
 if test "$DRI" != no; then
 +	if test "$cross_compiling" = "no" ; then
@ -19,17 +19,18 @@
 fi
 
 AC_MSG_CHECKING([whether to include DRI support])
-@@ -113,8 +119,12 @@
+@@ -133,8 +139,12 @@ AC_MSG_RESULT([$XVMC])
 
 AM_CONDITIONAL(XVMC, test x$XVMC = xyes)
 
 -AC_CHECK_FILE([${sdkdir}/xf86Module.h],
+-              [have_xf86Module_h="yes"], [have_xf86Module_h="no"])
 +if test "$cross_compiling" = "no" ; then
 +	AC_CHECK_FILE([${sdkdir}/xf86Module.h],
-               [have_xf86Module_h="yes"], [have_xf86Module_h="no"])
+		[have_xf86Module_h="yes"], [have_xf86Module_h="no"])
 +else
 +	have_xf86Module_h="yes"
 +fi
 
 # Check the ABI_VIDEODRV_VERSION
- SAVE_CPPFLAGS="$CPPFLAGS"
+ SAVE_CFLAGS="$CFLAGS"
--- a/package/x11r7/openchrome/openchrome.mk
+++ b/package/x11r7/openchrome/openchrome.mk
@ -3,13 +3,13 @@
 # openchrome
 #
 #############################################################
-OPENCHROME_VERSION = r355
-OPENCHROME_SOURCE = openchrome-$(OPENCHROME_VERSION).tar.bz2
-OPENCHROME_SITE = http://bazaar.mezis.net/
+OPENCHROME_VERSION = 0.2.902
+OPENCHROME_SOURCE = xf86-video-openchrome-$(OPENCHROME_VERSION).tar.bz2
+OPENCHROME_SITE = http://www.openchrome.org/releases

 OPENCHROME_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto

-OPENCHROME_AUTORECONF = NO
+OPENCHROME_AUTORECONF = YES
 OPENCHROME_CONF_OPT = --enable-shared --disable-static

 $(eval $(call AUTOTARGETS,package/x11r7,openchrome))
--- a/package/x11r7/xdata_xkbdata/Config.in
+++ b/package/x11r7/xdata_xkbdata/Config.in
@ -1,7 +0,0 @@
-config BR2_PACKAGE_XDATA_XKBDATA
-	bool "xkbdata"
-	default n
-	depends on !BR2_PACKAGE_XKEYBOARD_CONFIG
-	help
-	  xkbdata 1.0.1
-	  No description available
--- a/package/x11r7/xdata_xkbdata/xdata_xkbdata.mk
+++ b/package/x11r7/xdata_xkbdata/xdata_xkbdata.mk
@ -1,16 +0,0 @@
-################################################################################
-#
-# xdata_xkbdata -- No description available
-#
-################################################################################
-
-XDATA_XKBDATA_VERSION = 1.0.1
-XDATA_XKBDATA_SOURCE = xkbdata-$(XDATA_XBITMAPS_VERSION).tar.bz2
-XDATA_XKBDATA_SITE = http://xorg.freedesktop.org/releases/individual/data
-XDATA_XKBDATA_AUTORECONF = NO
-XDATA_XKBDATA_INSTALL_STAGING = YES
-XDATA_XKBDATA_INSTALL_TARGET = YES
-XDATA_XKBDATA_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install
-XDATA_XKBDATA_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,package/x11r7,xdata_xkbdata))
--- a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
+++ b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_ACECAD_VERSION = 1.2.0
+XDRIVER_XF86_INPUT_ACECAD_VERSION = 1.2.2
 XDRIVER_XF86_INPUT_ACECAD_SOURCE = xf86-input-acecad-$(XDRIVER_XF86_INPUT_ACECAD_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_ACECAD_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_ACECAD_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
+++ b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_AIPTEK_VERSION = 1.0.1
+XDRIVER_XF86_INPUT_AIPTEK_VERSION = 1.1.1
 XDRIVER_XF86_INPUT_AIPTEK_SOURCE = xf86-input-aiptek-$(XDRIVER_XF86_INPUT_AIPTEK_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_AIPTEK_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_AIPTEK_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk
+++ b/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_CALCOMP_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_CALCOMP_VERSION = 1.1.2
 XDRIVER_XF86_INPUT_CALCOMP_SOURCE = xf86-input-calcomp-$(XDRIVER_XF86_INPUT_CALCOMP_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_CALCOMP_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_CALCOMP_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk
+++ b/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_CITRON_VERSION = 2.2.0
+XDRIVER_XF86_INPUT_CITRON_VERSION = 2.2.1
 XDRIVER_XF86_INPUT_CITRON_SOURCE = xf86-input-citron-$(XDRIVER_XF86_INPUT_CITRON_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_CITRON_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_CITRON_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk
+++ b/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_DMC_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_DMC_VERSION = 1.1.2
 XDRIVER_XF86_INPUT_DMC_SOURCE = xf86-input-dmc-$(XDRIVER_XF86_INPUT_DMC_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_DMC_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_DMC_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk
+++ b/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_DYNAPRO_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_DYNAPRO_VERSION = 1.1.2
 XDRIVER_XF86_INPUT_DYNAPRO_SOURCE = xf86-input-dynapro-$(XDRIVER_XF86_INPUT_DYNAPRO_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_DYNAPRO_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_DYNAPRO_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk
+++ b/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_ELO2300_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_ELO2300_VERSION = 1.1.2
 XDRIVER_XF86_INPUT_ELO2300_SOURCE = xf86-input-elo2300-$(XDRIVER_XF86_INPUT_ELO2300_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_ELO2300_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_ELO2300_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk
+++ b/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_ELOGRAPHICS_VERSION = 1.0.0.5
+XDRIVER_XF86_INPUT_ELOGRAPHICS_VERSION = 1.2.1
 XDRIVER_XF86_INPUT_ELOGRAPHICS_SOURCE = xf86-input-elographics-$(XDRIVER_XF86_INPUT_ELOGRAPHICS_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_ELOGRAPHICS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_ELOGRAPHICS_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-10-bitfield-fixes.patch
+++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-10-bitfield-fixes.patch
@ -0,0 +1,324 @@
+From: Zephaniah E. Hull <warp@aehallh.com>
+Date: Sun, 14 May 2006 11:55:50 +0000 (+0000)
+Subject: Tweak credits and references.
+X-Git-Tag: xf86-video-impact-0_2_0
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-evdev.git;a=commitdiff;h=e9c60da89a9c55b81b2dedcf6ee3d1aefb4ff591
+
+Tweak credits and references.
+Change the longs to unsigned longs in the bitfields.
+Cleanup our includes.
+Stop pulling in asm/types.h and asm/bitops.h.
+Conditionally define the stuff that used to come from the above, including
+    our own test_bit, set_bit and clear_bit.
+Change the longs to unsigned longs in the bitfields.
+Change the longs to unsigned longs in the bitfields.
+Use the bitop defines in evdev.h properly.
+Change the longs to unsigned longs in the bitfields.
+Change the longs to unsigned longs in the bitfields.
+Use the bitop defines in evdev.h properly.
+Change the longs to unsigned longs in the bitfields.
+Use the bitop defines in evdev.h properly.
+Add HPPA/HPPA64 entries. (Thanks to Fabio M. Di Nitto
+    <fabbione@ubuntu.com>)
+---
+
+--- a/ChangeLog
+++ b/ChangeLog
+@@ -1,3 +1,37 @@
+2006-05-14  Zephaniah E. Hull  <warp@aehallh.com>
+
+	* man/evdev.man:
+	Tweak credits and references.
+	* src/evdev.c: (EvdevParseBits), (EvdevParseBitOption),
+	(EvdevCorePreInit):
+	Change the longs to unsigned longs in the bitfields.
+
+	Cleanup our includes.
+	* src/evdev.h:
+	Stop pulling in asm/types.h and asm/bitops.h.
+
+	Conditionally define the stuff that used to come from
+	the above, including our own test_bit, set_bit and clear_bit.
+
+	Change the longs to unsigned longs in the bitfields.
+	* src/evdev_axes.c: (EvdevAxisAbsNew), (EvdevAxisRelNew):
+	Change the longs to unsigned longs in the bitfields.
+
+	Use the bitop defines in evdev.h properly.
+	* src/evdev_brain.c: (MatchAll), (MatchNot), (MatchAny):
+	Change the longs to unsigned longs in the bitfields.
+	* src/evdev_btn.c: (EvdevBtnNew):
+	Change the longs to unsigned longs in the bitfields.
+
+	Use the bitop defines in evdev.h properly.
+	* src/evdev_key.c: (EvdevKeyNew):
+	Change the longs to unsigned longs in the bitfields.
+
+	Use the bitop defines in evdev.h properly.
+	* src/inotify-syscalls.h:
+	Add HPPA/HPPA64 entries. (Thanks to Fabio M. Di Nitto
+	<fabbione@ubuntu.com>)
+
+ 2006-04-30  Zephaniah E. Hull  <warp@aehallh.com>
+ 
+ 	* configure.ac:
+--- a/src/evdev.c
+++ b/src/evdev.c
+@@ -61,8 +61,6 @@
+ #include <X11/XF86keysym.h>
+ #include <X11/extensions/XIproto.h>
+ 
+-#include <string.h>
+-
+ #include "evdev.h"
+ 
+ #include <xf86.h>
+@@ -328,7 +326,7 @@ EvdevNew(evdevDriverPtr driver, evdevDev
+ }
+ 
+ static void
+-EvdevParseBits (char *in, long *out, int len)
+EvdevParseBits (char *in, unsigned long *out, int len)
+ {
+     unsigned long v[2];
+     int n, i, max_bits = len * BITS_PER_LONG;
+@@ -351,7 +349,7 @@ EvdevParseBits (char *in, long *out, int
+ }
+ 
+ static void
+-EvdevParseBitOption (char *opt, long *all, long *not, long *any, int len)
+EvdevParseBitOption (char *opt, unsigned long *all, unsigned long *not, unsigned long *any, int len)
+ {
+     char *cur, *next;
+ 
+@@ -395,7 +393,7 @@ EvdevCorePreInit(InputDriverPtr drv, IDe
+ 	EvdevParseBitOption (tmp, pEvdev->all_bits.field,			\
+ 		pEvdev->not_bits.field,					\
+ 		pEvdev->any_bits.field,					\
+-		sizeof(pEvdev->not_bits.field) / sizeof (long));		\
+		sizeof(pEvdev->not_bits.field) / sizeof (unsigned long));	\
+ 	free (tmp);								\
+     }
+     bitoption(ev);
+--- a/src/evdev.h
+++ b/src/evdev.h
+@@ -72,20 +72,29 @@
+ #include <stdarg.h>
+ #include <xf86Xinput.h>
+ 
+#ifndef BITS_PER_LONG
+ #define BITS_PER_LONG		(sizeof(long) * 8)
+#endif
+
+ #define NBITS(x)		((((x)-1)/BITS_PER_LONG)+1)
+-#define OFF(x) 			((x)%BITS_PER_LONG)
+-#define LONG(x)			((x)/BITS_PER_LONG)
+-#define BIT(x)			(1UL<<((x)%BITS_PER_LONG))
+-#define test_bit(bit, array)    ((array[LONG(bit)] >> OFF(bit)) & 1)
+#define LONG(x)			((x) >> (sizeof(unsigned long) + 1))
+#define MASK(x)			(1 << ((x) & (sizeof (unsigned long) * 8 - 1)))
+
+#ifndef test_bit
+#define test_bit(bit, array)	(array[LONG(bit)] & MASK(bit))
+#endif
+#ifndef set_bit
+#define set_bit(bit, array)	(array[LONG(bit)] |= MASK(bit))
+#endif
+#ifndef clear_bit
+#define clear_bit(bit, array)	(array[LONG(bit)] &= ~MASK(bit))
+#endif
+ 
+ /* 2.4 compatibility */
+ #ifndef EVIOCGSW
+ 
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+-#include <asm/types.h>
+-#include <asm/bitops.h>
+ 
+ #define EVIOCGSW(len)		_IOC(_IOC_READ, 'E', 0x1b, len)		/* get all switch states */
+ 
+@@ -128,14 +137,14 @@
+ #define EVDEV_MAXBUTTONS	96
+ 
+ typedef struct {
+-    long	ev[NBITS(EV_MAX)];
+-    long	key[NBITS(KEY_MAX)];
+-    long	rel[NBITS(REL_MAX)];
+-    long	abs[NBITS(ABS_MAX)];
+-    long	msc[NBITS(MSC_MAX)];
+-    long	led[NBITS(LED_MAX)];
+-    long	snd[NBITS(SND_MAX)];
+-    long	ff[NBITS(FF_MAX)];
+    unsigned long	ev[NBITS(EV_MAX)];
+    unsigned long	key[NBITS(KEY_MAX)];
+    unsigned long	rel[NBITS(REL_MAX)];
+    unsigned long	abs[NBITS(ABS_MAX)];
+    unsigned long	msc[NBITS(MSC_MAX)];
+    unsigned long	led[NBITS(LED_MAX)];
+    unsigned long	snd[NBITS(SND_MAX)];
+    unsigned long	ff[NBITS(FF_MAX)];
+ } evdevBitsRec, *evdevBitsPtr;
+ 
+ typedef struct {
+--- a/src/evdev_axes.c
+++ b/src/evdev_axes.c
+@@ -49,14 +49,6 @@
+ 
+ #include <xf86_OSproc.h>
+ 
+-#define ArrayLength(a) (sizeof(a) / (sizeof((a)[0])))
+-
+-#define BITS_PER_LONG (sizeof(long) * 8)
+-#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
+-#define OFF(x)  ((x)%BITS_PER_LONG)
+-#define LONG(x) ((x)/BITS_PER_LONG)
+-#define TestBit(bit, array)    ((array[LONG(bit)] >> OFF(bit)) & 1)
+-
+ static char *rel_axis_names[] = {
+     "X",
+     "Y",
+@@ -328,7 +320,7 @@ EvdevAxisAbsNew(InputInfoPtr pInfo)
+ 
+     real_axes = 0;
+     for (i = 0; i < ABS_MAX; i++)
+-	if (TestBit (i, pEvdev->bits.abs))
+	if (test_bit (i, pEvdev->bits.abs))
+ 	    real_axes++;
+ 
+     if (!real_axes)
+@@ -344,7 +336,7 @@ EvdevAxisAbsNew(InputInfoPtr pInfo)
+     pInfo->conversion_proc = EvdevConvert;
+ 
+     for (i = 0, j = 0; i < ABS_MAX; i++) {
+-	if (!TestBit (i, pEvdev->bits.abs))
+	if (!test_bit (i, pEvdev->bits.abs))
+ 	    continue;
+ 
+ 	snprintf(option, sizeof(option), "%sAbsoluteAxisMap", abs_axis_names[i]);
+@@ -389,7 +381,7 @@ EvdevAxisAbsNew(InputInfoPtr pInfo)
+ 	xf86Msg(X_CONFIG, "%s: Unknown Mode: %s.\n", pInfo->name, s);
+     }
+ 
+-    if (TestBit (ABS_X, pEvdev->bits.abs) && TestBit (ABS_Y, pEvdev->bits.abs))
+    if (test_bit (ABS_X, pEvdev->bits.abs) && test_bit (ABS_Y, pEvdev->bits.abs))
+ 	k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", 0);
+     else
+ 	k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", -1);
+@@ -417,7 +409,7 @@ EvdevAxisRelNew(InputInfoPtr pInfo)
+ 
+     real_axes = 0;
+     for (i = 0; i < REL_MAX; i++)
+-	if (TestBit (i, pEvdev->bits.rel))
+	if (test_bit (i, pEvdev->bits.rel))
+ 	    real_axes++;
+ 
+     if (!real_axes && (!state->abs || state->abs->axes < 2))
+@@ -434,7 +426,7 @@ EvdevAxisRelNew(InputInfoPtr pInfo)
+     pInfo->conversion_proc = EvdevConvert;
+ 
+     for (i = 0, j = 0; i < REL_MAX; i++) {
+-	if (!TestBit (i, pEvdev->bits.rel))
+	if (!test_bit (i, pEvdev->bits.rel))
+ 	    continue;
+ 
+ 	snprintf(option, sizeof(option), "%sRelativeAxisMap", rel_axis_names[i]);
+--- a/src/evdev_brain.c
+++ b/src/evdev_brain.c
+@@ -86,7 +86,7 @@ typedef struct {
+ } evdevDevInfoRec, *evdevDevInfoPtr;
+ 
+ static Bool
+-MatchAll (long *dev, long *match, int len)
+MatchAll (unsigned long *dev, unsigned long *match, int len)
+ {
+     int i;
+ 
+@@ -98,7 +98,7 @@ MatchAll (long *dev, long *match, int le
+ }
+ 
+ static Bool
+-MatchNot (long *dev, long *match, int len)
+MatchNot (unsigned long *dev, unsigned long *match, int len)
+ {
+     int i;
+ 
+@@ -110,7 +110,7 @@ MatchNot (long *dev, long *match, int le
+ }
+ 
+ static Bool
+-MatchAny (long *dev, long *match, int len)
+MatchAny (unsigned long *dev, unsigned long *match, int len)
+ {
+     int i, found = 0;
+ 
+--- a/src/evdev_btn.c
+++ b/src/evdev_btn.c
+@@ -51,15 +51,6 @@
+ 
+ #include <xf86Module.h>
+ 
+-
+-#define ArrayLength(a) (sizeof(a) / (sizeof((a)[0])))
+-
+-#define BITS_PER_LONG (sizeof(long) * 8)
+-#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
+-#define OFF(x)  ((x)%BITS_PER_LONG)
+-#define LONG(x) ((x)/BITS_PER_LONG)
+-#define TestBit(bit, array)    ((array[LONG(bit)] >> OFF(bit)) & 1)
+-
+ void
+ EvdevBtnPostFakeClicks(InputInfoPtr pInfo, int button, int count)
+ {
+@@ -186,7 +177,7 @@ EvdevBtnNew(InputInfoPtr pInfo)
+     state->btn = Xcalloc (sizeof (evdevBtnRec));
+ 
+     for (i = BTN_MISC; i < (KEY_OK - 1); i++)
+-	if (TestBit (i, pEvdev->bits.key)) {
+	if (test_bit (i, pEvdev->bits.key)) {
+ 	    bit = i;
+ 	    if ((bit >= BTN_MOUSE) && (bit < BTN_JOYSTICK)) {
+ 		bit -= BTN_MOUSE - BTN_MISC;
+--- a/src/evdev_key.c
+++ b/src/evdev_key.c
+@@ -81,11 +81,6 @@
+ 
+ 
+ #define ArrayLength(a) (sizeof(a) / (sizeof((a)[0])))
+-#define BITS_PER_LONG (sizeof(long) * 8)
+-#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
+-#define OFF(x)  ((x)%BITS_PER_LONG)
+-#define LONG(x) ((x)/BITS_PER_LONG)
+-#define TestBit(bit, array)    ((array[LONG(bit)] >> OFF(bit)) & 1)
+ 
+ #define MIN_KEYCODE 8
+ #define GLYPHS_PER_KEY 2
+@@ -356,13 +351,13 @@ EvdevKeyNew (InputInfoPtr pInfo)
+     int i, keys = 0;
+ 
+     for (i = 0; i <= KEY_UNKNOWN; i++)
+-	if (TestBit (i, pEvdev->bits.key)) {
+	if (test_bit (i, pEvdev->bits.key)) {
+ 	    keys = 1;
+ 	    break;
+ 	}
+     if (!keys)
+ 	for (i = KEY_OK; i <= KEY_MAX; i++)
+-	    if (TestBit (i, pEvdev->bits.key)) {
+	    if (test_bit (i, pEvdev->bits.key)) {
+ 		keys = 1;
+ 		break;
+ 	    }
+--- a/src/inotify-syscalls.h
+++ b/src/inotify-syscalls.h
+@@ -39,6 +39,10 @@
+ # define __NR_inotify_init	290
+ # define __NR_inotify_add_watch	291
+ # define __NR_inotify_rm_watch	292
+#elif defined (__hppa__) || defined (__hppa64__)
+# define __NR_inotify_init	269
+# define __NR_inotify_add_watch	270
+# define __NR_inotify_rm_watch	271
+ #else
+ # error "Unsupported architecture!"
+ #endif
--- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-11-bitops-fixes.patch
+++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-11-bitops-fixes.patch
@ -0,0 +1,42 @@
+From: Zephaniah E. Hull <warp@aehallh.com>
+Date: Mon, 15 May 2006 22:47:23 +0000 (+0000)
+Subject: Hopefully fix the bitops stuff to actually _work_.
+X-Git-Tag: xf86-video-impact-0_2_0
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-evdev.git;a=commitdiff;h=1b03250797daa0ac98323a9f43e895dd0b5c7761
+
+Hopefully fix the bitops stuff to actually _work_.
+---
+
+--- a/ChangeLog
+++ b/ChangeLog
+@@ -1,3 +1,8 @@
+2006-05-15  Zephaniah E. Hull,,,  <warp@aehallh.com>
+
+	* src/evdev.h:
+	Hopefully fix the bitops stuff to actually _work_.
+
+ 2006-05-14  Zephaniah E. Hull  <warp@aehallh.com>
+ 
+ 	* man/evdev.man:
+--- a/src/evdev.h
+++ b/src/evdev.h
+@@ -73,15 +73,15 @@
+ #include <xf86Xinput.h>
+ 
+ #ifndef BITS_PER_LONG
+-#define BITS_PER_LONG		(sizeof(long) * 8)
+#define BITS_PER_LONG		(sizeof(unsigned long) * 8)
+ #endif
+ 
+ #define NBITS(x)		((((x)-1)/BITS_PER_LONG)+1)
+-#define LONG(x)			((x) >> (sizeof(unsigned long) + 1))
+-#define MASK(x)			(1 << ((x) & (sizeof (unsigned long) * 8 - 1)))
+#define LONG(x)			((x)/BITS_PER_LONG)
+#define MASK(x)			(1UL << ((x) & (BITS_PER_LONG - 1)))
+ 
+ #ifndef test_bit
+-#define test_bit(bit, array)	(array[LONG(bit)] & MASK(bit))
+#define test_bit(bit, array)	(!!(array[LONG(bit)] & MASK(bit)))
+ #endif
+ #ifndef set_bit
+ #define set_bit(bit, array)	(array[LONG(bit)] |= MASK(bit))
--- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-20-add-inotify-architectures.patch
+++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-20-add-inotify-architectures.patch
@ -0,0 +1,29 @@
+Index: xserver-xorg-input-evdev/src/inotify-syscalls.h
+===================================================================
+--- xserver-xorg-input-evdev.orig/src/inotify-syscalls.h	2006-11-01 19:37:12.000000000 +1100
+++ xserver-xorg-input-evdev/src/inotify-syscalls.h	2006-11-01 19:59:51.000000000 +1100
+@@ -43,6 +43,24 @@
+ # define __NR_inotify_init	269
+ # define __NR_inotify_add_watch	270
+ # define __NR_inotify_rm_watch	271
+#elif defined (__mips__)
+# if _MIPS_SIM == _MIPS_SIM_ABI32
+#  define __NR_inotify_init		4284
+#  define __NR_inotify_add_watch	4285
+#  define __NR_inotify_rm_watch		4286
+# elif _MIPS_SIM == _MIPS_SIM_NABI32
+#  define __NR_inotify_init		6247
+#  define __NR_inotify_add_watch	6248
+#  define __NR_inotify_rm_watch		6249
+# elif _MIPS_SIM == _MIPS_SIM_ABI64
+#  define __NR_inotify_init		5243
+#  define __NR_inotify_add_watch	5244
+#  define __NR_inotify_rm_watch		5245
+# endif
+#elif defined (__mc68000__)
+# define __NR_inotify_init	284
+# define __NR_inotify_add_watch	285
+# define __NR_inotify_rm_watch	286
+ #else
+ # error "Unsupported architecture!"
+ #endif
--- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-30-absolute-axis.patch
+++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-30-absolute-axis.patch
@ -0,0 +1,31 @@
+From: Adam Jackson <ajax@nwnk.net>
+Date: Fri, 2 Jun 2006 19:39:52 +0000 (+0000)
+Subject: Fix an obvious bogon to avoid crashing on absolute axis setup.
+X-Git-Tag: xf86-video-impact-0_2_0
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-evdev.git;a=commitdiff;h=57a7f2844108072bf03c9f82baf92e3447d18fbe
+
+Fix an obvious bogon to avoid crashing on absolute axis setup.
+---
+
+--- a/ChangeLog
+++ b/ChangeLog
+@@ -1,3 +1,8 @@
+2006-06-02  Adam Jackson  <ajax@freedesktop.org>
+
+	* src/evdev_axes.c:
+	Fix an obvious bogon to avoid crashing on absolute axis setup.
+
+ 2006-05-15  Zephaniah E. Hull,,,  <warp@aehallh.com>
+ 
+ 	* src/evdev.h:
+--- a/src/evdev_axes.c
+++ b/src/evdev_axes.c
+@@ -385,7 +385,7 @@ EvdevAxisAbsNew(InputInfoPtr pInfo)
+ 	k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", 0);
+     else
+ 	k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", -1);
+-    if (k < screenInfo.numScreens) {
+    if (k < screenInfo.numScreens && k >= 0) {
+ 	state->abs->screen = k;
+ 	xf86Msg(X_CONFIG, "%s: AbsoluteScreen: %d.\n", pInfo->name, k);
+     } else {
--- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-40-close-fd.patch
+++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-40-close-fd.patch
@ -0,0 +1,18 @@
+From: Zephaniah E. Hull <warp@agamemnon.b5>
+Date: Tue, 11 Jul 2006 07:08:30 +0000 (-0400)
+Subject: Set pInfo->fd to -1 when we close it in EvdevProc.
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-evdev.git;a=commitdiff;h=eba5ea8d5a19f2b1984cbf20c95d22e243f19567
+
+Set pInfo->fd to -1 when we close it in EvdevProc.
+---
+
+--- a/src/evdev.c
+++ b/src/evdev.c
+@@ -200,6 +200,7 @@ EvdevProc(DeviceIntPtr device, int what)
+ 	    RemoveEnabledDevice (pInfo->fd);
+ 	    xf86RemoveSIGIOHandler (pInfo->fd);
+ 	    close (pInfo->fd);
+	    pInfo->fd = -1;
+ 
+ 	    if (pEvdev->state.axes)
+ 		EvdevAxesOff (device);
--- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-50-xinput.patch
+++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-50-xinput.patch
@ -0,0 +1,21 @@
+--- a/src/evdev.c	2008-06-23 08:40:50.000000000 -0400
+++ b/src/evdev.c	2008-06-23 08:42:00.000000000 -0400
+@@ -233,10 +233,6 @@ EvdevSwitchMode (ClientPtr client, Devic
+ 	    else
+ 		return !Success;
+ 	    break;
+-	case SendCoreEvents:
+-	case DontSendCoreEvents:
+-	    xf86XInputSetSendCoreEvents (pInfo, (mode == SendCoreEvents));
+-	    break;
+ 	default:
+ 	    return !Success;
+     }
+@@ -263,7 +259,6 @@ EvdevNew(evdevDriverPtr driver, evdevDev
+     pInfo->device_control = EvdevProc;
+     pInfo->read_input = EvdevReadInput;
+     pInfo->switch_mode = EvdevSwitchMode;
+-    pInfo->motion_history_proc = xf86GetMotionEvents;
+     pInfo->conf_idev = driver->dev;
+ 
+     pInfo->private = device;
--- a/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk
+++ b/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_FPIT_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_FPIT_VERSION = 1.2.0
 XDRIVER_XF86_INPUT_FPIT_SOURCE = xf86-input-fpit-$(XDRIVER_XF86_INPUT_FPIT_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_FPIT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_FPIT_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk
+++ b/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_HYPERPEN_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_HYPERPEN_VERSION = 1.2.0
 XDRIVER_XF86_INPUT_HYPERPEN_SOURCE = xf86-input-hyperpen-$(XDRIVER_XF86_INPUT_HYPERPEN_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_HYPERPEN_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_HYPERPEN_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk
+++ b/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_JAMSTUDIO_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_JAMSTUDIO_VERSION = 1.2.0
 XDRIVER_XF86_INPUT_JAMSTUDIO_SOURCE = xf86-input-jamstudio-$(XDRIVER_XF86_INPUT_JAMSTUDIO_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_JAMSTUDIO_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_JAMSTUDIO_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
+++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.2.3
+XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.3.2
 XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JOYSTICK_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_JOYSTICK_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
+++ b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.2.2
+XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.3.1
 XDRIVER_XF86_INPUT_KEYBOARD_SOURCE = xf86-input-keyboard-$(XDRIVER_XF86_INPUT_KEYBOARD_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_KEYBOARD_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk
+++ b/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_MAGELLAN_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_MAGELLAN_VERSION = 1.2.0
 XDRIVER_XF86_INPUT_MAGELLAN_SOURCE = xf86-input-magellan-$(XDRIVER_XF86_INPUT_MAGELLAN_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_MAGELLAN_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_MAGELLAN_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk
+++ b/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_MICROTOUCH_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_MICROTOUCH_VERSION = 1.2.0
 XDRIVER_XF86_INPUT_MICROTOUCH_SOURCE = xf86-input-microtouch-$(XDRIVER_XF86_INPUT_MICROTOUCH_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_MICROTOUCH_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_MICROTOUCH_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
+++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.2.2
+XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.3.0
 XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_MOUSE_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk
+++ b/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_MUTOUCH_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_MUTOUCH_VERSION = 1.2.0
 XDRIVER_XF86_INPUT_MUTOUCH_SOURCE = xf86-input-mutouch-$(XDRIVER_XF86_INPUT_MUTOUCH_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_MUTOUCH_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_MUTOUCH_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk
+++ b/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_PALMAX_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_PALMAX_VERSION = 1.2.0
 XDRIVER_XF86_INPUT_PALMAX_SOURCE = xf86-input-palmax-$(XDRIVER_XF86_INPUT_PALMAX_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_PALMAX_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_PALMAX_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk
+++ b/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_PENMOUNT_VERSION = 1.2.0
+XDRIVER_XF86_INPUT_PENMOUNT_VERSION = 1.3.0
 XDRIVER_XF86_INPUT_PENMOUNT_SOURCE = xf86-input-penmount-$(XDRIVER_XF86_INPUT_PENMOUNT_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_PENMOUNT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_PENMOUNT_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk
+++ b/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_SPACEORB_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_SPACEORB_VERSION = 1.1.1
 XDRIVER_XF86_INPUT_SPACEORB_SOURCE = xf86-input-spaceorb-$(XDRIVER_XF86_INPUT_SPACEORB_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_SPACEORB_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_SPACEORB_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk
+++ b/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_SUMMA_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_SUMMA_VERSION = 1.2.0
 XDRIVER_XF86_INPUT_SUMMA_SOURCE = xf86-input-summa-$(XDRIVER_XF86_INPUT_SUMMA_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_SUMMA_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_SUMMA_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-synaptics/Config.in
+++ b/package/x11r7/xdriver_xf86-input-synaptics/Config.in
@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_SYNAPTICS
+	bool "xf86-input-synaptics"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-synaptics 0.14.7
+	  X.Org driver for synaptics input devices
--- a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics-0.14.7~git20070706-configure.patch
+++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics-0.14.7~git20070706-configure.patch
@ -0,0 +1,8 @@
+diff -Nwrup xfree86-driver-synaptics_0.14.7~git20070706.orig/configure xdriver_xf86-input-synaptics-0.14.7~git20070706/configure
+--- a/.stamp_configured	1969-12-31 19:00:00.000000000 -0500
+++ b/.stamp_configured	2008-06-23 11:01:16.000000000 -0400
+@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "Dummy configure"
+ 
--- a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
+++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
@ -0,0 +1,14 @@
+################################################################################
+#
+# xdriver_xf86-input-synaptics -- X.Org driver for synaptics input devices
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 0.14.7~git20070706
+XDRIVER_XF86_INPUT_SYNAPTICS_SOURCE = xfree86-driver-synaptics_$(XDRIVER_XF86_INPUT_SYNAPTICS_VERSION).orig.tar.gz
+XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://ftp.de.debian.org/debian/pool/main/x/xfree86-driver-synaptics
+XDRIVER_XF86_INPUT_SYNAPTICS_AUTORECONF = NO
+XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_SYNAPTICS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-synaptics))
--- a/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk
+++ b/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_TEK4957_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_TEK4957_VERSION = 1.2.0
 XDRIVER_XF86_INPUT_TEK4957_SOURCE = xf86-input-tek4957-$(XDRIVER_XF86_INPUT_TEK4957_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_TEK4957_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_TEK4957_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
+++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 12.4.1
+XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 12.5.1
 XDRIVER_XF86_INPUT_VMMOUSE_SOURCE = xf86-input-vmmouse-$(XDRIVER_XF86_INPUT_VMMOUSE_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_VMMOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_VMMOUSE_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
+++ b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_INPUT_VOID_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_VOID_VERSION = 1.1.1
 XDRIVER_XF86_INPUT_VOID_SOURCE = xf86-input-void-$(XDRIVER_XF86_INPUT_VOID_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_VOID_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_VOID_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
+++ b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_APM_VERSION = 1.1.1
+XDRIVER_XF86_VIDEO_APM_VERSION = 1.2.0
 XDRIVER_XF86_VIDEO_APM_SOURCE = xf86-video-apm-$(XDRIVER_XF86_VIDEO_APM_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_APM_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_APM_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
+++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_ARK_VERSION = 0.6.0
+XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.0
 XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_ARK_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-6.6.3.patch
+++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-6.6.3.patch
@ -1,23 +0,0 @@
--- xf86-video-ati-6.6.3/configure.ac.orig	2007-06-10 12:02:12.000000000 +0200
-+++ xf86-video-ati-6.6.3/configure.ac	2007-06-10 12:02:31.000000000 +0200
-@@ -84,13 +84,19 @@
- # Checks for header files.
- AC_HEADER_STDC
- 
-if test "$DRI" != no; then
-+if test "x$DRI" != xno; then
-+	if test "$cross_compiling" = no; then
- 	AC_CHECK_FILE([${sdkdir}/dri.h],
-                       [have_dri_h="yes"], [have_dri_h="no"])
- 	AC_CHECK_FILE([${sdkdir}/sarea.h],
-                       [have_sarea_h="yes"], [have_sarea_h="no"])
- 	AC_CHECK_FILE([${sdkdir}/dristruct.h],
-                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
-+	else
-+		have_dri_h="yes"
-+		have_sarea_h="yes"
-+		have_dristruct_h="yes"
-+	fi
- fi
- 
- AC_MSG_CHECKING([whether to include DRI support])
--- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-cross-compile.patch
+++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-cross-compile.patch
@ -0,0 +1,27 @@
+--- a/configure.ac	2008-06-23 10:39:28.000000000 -0400
+++ b/configure.ac	2008-06-23 10:40:46.000000000 -0400
+@@ -85,14 +85,20 @@ sdkdir=$(pkg-config --variable=sdkdir xo
+ AC_HEADER_STDC
+ 
+ if test "$DRI" != no; then
+-	AC_CHECK_FILE([${sdkdir}/dri.h],
+ 	if test "$cross_compiling" = "no" ; then
+		AC_CHECK_FILE([${sdkdir}/dri.h],
+                       [have_dri_h="yes"], [have_dri_h="no"])
+-	AC_CHECK_FILE([${sdkdir}/sarea.h],
+		AC_CHECK_FILE([${sdkdir}/sarea.h],
+                       [have_sarea_h="yes"], [have_sarea_h="no"])
+-	AC_CHECK_FILE([${sdkdir}/dristruct.h],
+		AC_CHECK_FILE([${sdkdir}/dristruct.h],
+                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
+-	AC_CHECK_FILE([${sdkdir}/damage.h],
+		AC_CHECK_FILE([${sdkdir}/damage.h],
+                       [have_damage_h="yes"], [have_damage_h="no"])
+ 	else
+ 		have_dri_h="yes"
+ 		have_sarea_h="yes"
+ 		have_dristruct_h="yes"
+ 	fi
+ fi
+ 
+ AC_MSG_CHECKING([whether to include DRI support])
--- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
+++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_ATI_VERSION = 6.6.3
+XDRIVER_XF86_VIDEO_ATI_VERSION = 6.8.191
 XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_ATI_AUTORECONF = NO
+XDRIVER_XF86_VIDEO_ATI_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto

 $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-ati))
--- a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
+++ b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_CHIPS_VERSION = 1.1.1
+XDRIVER_XF86_VIDEO_CHIPS_VERSION = 1.2.0
 XDRIVER_XF86_VIDEO_CHIPS_SOURCE = xf86-video-chips-$(XDRIVER_XF86_VIDEO_CHIPS_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_CHIPS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_CHIPS_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
+++ b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_CIRRUS_VERSION = 1.1.0
+XDRIVER_XF86_VIDEO_CIRRUS_VERSION = 1.2.1
 XDRIVER_XF86_VIDEO_CIRRUS_SOURCE = xf86-video-cirrus-$(XDRIVER_XF86_VIDEO_CIRRUS_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_CIRRUS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_CIRRUS_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix-1.1.0-cross-compile.patch
+++ b/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix-1.1.0-cross-compile.patch
@ -0,0 +1,31 @@
+--- a/configure	2006-04-07 14:48:07.000000000 -0400
+++ b/configure	2008-06-23 11:09:35.000000000 -0400
+@@ -20264,28 +20264,8 @@ echo "$as_me: Building with package name
+ as_ac_File=`echo "ac_cv_file_$prefix/share/X11/sgml/defs.ent" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $prefix/share/X11/sgml/defs.ent" >&5
+ echo $ECHO_N "checking for $prefix/share/X11/sgml/defs.ent... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_File+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  test "$cross_compiling" = yes &&
+-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+-   { (exit 1); exit 1; }; }
+-if test -r "$prefix/share/X11/sgml/defs.ent"; then
+-  eval "$as_ac_File=yes"
+-else
+-  eval "$as_ac_File=no"
+-fi
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+-if test `eval echo '${'$as_ac_File'}'` = yes; then
+-  DEFS_ENT_PATH=$prefix/share/X11/sgml
+-else
+   DEFS_ENT_PATH=
+ 
+-fi
+-
+ 
+ # Extract the first word of "linuxdoc", so it can be a program name with args.
+ set dummy linuxdoc; ac_word=$2
--- a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
+++ b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_FBDEV_VERSION = 0.3.1
+XDRIVER_XF86_VIDEO_FBDEV_VERSION = 0.4.0
 XDRIVER_XF86_VIDEO_FBDEV_SOURCE = xf86-video-fbdev-$(XDRIVER_XF86_VIDEO_FBDEV_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_FBDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_FBDEV_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.1.1.patch
+++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.1.1.patch
@ -1,21 +0,0 @@
--- xf86-video-glint-1.1.1/configure.ac.orig	2007-06-10 20:58:34.000000000 +0200
-+++ xf86-video-glint-1.1.1/configure.ac	2007-06-10 20:58:58.000000000 +0200
-@@ -69,12 +69,18 @@
- AC_HEADER_STDC
- 
- if test "$DRI" != no; then
-+	if test "$cross_compiling" = "no" ; then
-         AC_CHECK_FILE([${sdkdir}/dri.h],
-                       [have_dri_h="yes"], [have_dri_h="no"])
-         AC_CHECK_FILE([${sdkdir}/sarea.h],
-                       [have_sarea_h="yes"], [have_sarea_h="no"])
-         AC_CHECK_FILE([${sdkdir}/dristruct.h],
-                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
-+	else
-+		have_dri_h="yes"
-+		have_sarea_h="yes"
-+		have_dristruct_h="yes"
-+	fi
- fi
- 
- AC_MSG_CHECKING([whether to include DRI support])
--- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.0-cross-compile.patch
+++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.0-cross-compile.patch
@ -0,0 +1,29 @@
+--- a/configure.ac	2008-06-23 11:17:07.000000000 -0400
+++ b/configure.ac	2008-06-23 11:16:31.000000000 -0400
+@@ -75,12 +75,20 @@ CPPFLAGS="$SAVE_CPPFLAGS"
+ AC_HEADER_STDC
+ 
+ if test "$DRI" != no; then
+-        AC_CHECK_FILE([${sdkdir}/dri.h],
+-                      [have_dri_h="yes"], [have_dri_h="no"])
+-        AC_CHECK_FILE([${sdkdir}/sarea.h],
+-                      [have_sarea_h="yes"], [have_sarea_h="no"])
+-        AC_CHECK_FILE([${sdkdir}/dristruct.h],
+-                      [have_dristruct_h="yes"], [have_dristruct_h="no"])
+  	if test "$cross_compiling" = "no" ; then
+ 		AC_CHECK_FILE([${sdkdir}/dri.h],
+                        [have_dri_h="yes"], [have_dri_h="no"])
+ 		AC_CHECK_FILE([${sdkdir}/sarea.h],
+                        [have_sarea_h="yes"], [have_sarea_h="no"])
+ 		AC_CHECK_FILE([${sdkdir}/dristruct.h],
+                        [have_dristruct_h="yes"], [have_dristruct_h="no"])
+ 		AC_CHECK_FILE([${sdkdir}/damage.h],
+                        [have_damage_h="yes"], [have_damage_h="no"])
+  	else
+  		have_dri_h="yes"
+  		have_sarea_h="yes"
+  		have_dristruct_h="yes"
+  	fi
+ fi
+ 
+ AC_MSG_CHECKING([whether to include DRI support])
--- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
+++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.1.1
+XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.2.0
 XDRIVER_XF86_VIDEO_GLINT_SOURCE = xf86-video-glint-$(XDRIVER_XF86_VIDEO_GLINT_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = NO
+XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_GLINT_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xproto

 $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-glint))
--- a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
+++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_I128_VERSION = 1.2.1
+XDRIVER_XF86_VIDEO_I128_VERSION = 1.3.0
 XDRIVER_XF86_VIDEO_I128_SOURCE = xf86-video-i128-$(XDRIVER_XF86_VIDEO_I128_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_I128_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_I128_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
+++ b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_I740_VERSION = 1.1.0
+XDRIVER_XF86_VIDEO_I740_VERSION = 1.2.0
 XDRIVER_XF86_VIDEO_I740_SOURCE = xf86-video-i740-$(XDRIVER_XF86_VIDEO_I740_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_I740_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_I740_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.7.4-cross-compile.patch
+++ b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.7.4-cross-compile.patch
--- a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk
+++ b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_I810_VERSION = 1.6.5
+XDRIVER_XF86_VIDEO_I810_VERSION = 1.7.4
 XDRIVER_XF86_VIDEO_I810_SOURCE = xf86-video-i810-$(XDRIVER_XF86_VIDEO_I810_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_I810_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_I810_AUTORECONF = NO
+XDRIVER_XF86_VIDEO_I810_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_I810_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto

 $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-i810))
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.3.2-cross-compile.patch
+++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.3.2-cross-compile.patch
@ -0,0 +1,30 @@
+--- xf86-video-i810-1.6.5/configure.ac.orig	2007-06-10 20:59:27.000000000 +0200
+++ xf86-video-i810-1.6.5/configure.ac	2007-06-10 20:59:50.000000000 +0200
+@@ -92,13 +92,14 @@ AC_HEADER_STDC
+ 
+ AC_MSG_CHECKING([whether to include DRI support])
+ if test x$DRI = xauto; then
+ 	if test "$cross_compiling" = "no" ; then
+         AC_CHECK_FILE([${sdkdir}/dri.h],
+                       [have_dri_h="yes"], [have_dri_h="no"])
+         AC_CHECK_FILE([${sdkdir}/sarea.h],
+                       [have_sarea_h="yes"], [have_sarea_h="no"])
+         AC_CHECK_FILE([${sdkdir}/dristruct.h],
+                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
+-	AC_CHECK_FILE([${sdkdir}/damage.h],
+		AC_CHECK_FILE([${sdkdir}/damage.h],
+                       [have_damage_h="yes"], [have_damage_h="no"])
+ 
+         if test "$have_dri_h" = yes -a \
+@@ -108,6 +109,12 @@ if test x$DRI = xauto; then
+         else
+                 DRI="no"
+         fi
+ 	else
+ 		have_dri_h="yes"
+ 		have_sarea_h="yes"
+		have_dristruct_h="yes"
+		DRI="yes"
+ 	fi
+ fi
+ AC_MSG_RESULT([$DRI])
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
+++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.1.1
+XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.3.2
 XDRIVER_XF86_VIDEO_INTEL_SOURCE = xf86-video-intel-$(XDRIVER_XF86_VIDEO_INTEL_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_INTEL_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = NO
+XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto

 $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-intel))
--- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.6.1.patch
+++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.6.1.patch
--- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
+++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_MGA_VERSION = 1.4.6.1
+XDRIVER_XF86_VIDEO_MGA_VERSION = 1.4.8
 XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_MGA_AUTORECONF = NO
+XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto

 $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-mga))
--- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
+++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.1.1
+XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.2.1
 XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_NEOMAGIC_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport-0.2.1-cross-compile.patch
+++ b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport-0.2.1-cross-compile.patch
@ -0,0 +1,31 @@
+--- a/configure	2006-10-13 18:36:20.000000000 -0400
+++ b/configure	2008-06-23 11:38:03.000000000 -0400
+@@ -20191,28 +20191,8 @@ echo "$as_me: Building with package name
+ as_ac_File=`echo "ac_cv_file_$prefix/share/X11/sgml/defs.ent" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $prefix/share/X11/sgml/defs.ent" >&5
+ echo $ECHO_N "checking for $prefix/share/X11/sgml/defs.ent... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_File+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  test "$cross_compiling" = yes &&
+-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+-   { (exit 1); exit 1; }; }
+-if test -r "$prefix/share/X11/sgml/defs.ent"; then
+-  eval "$as_ac_File=yes"
+-else
+-  eval "$as_ac_File=no"
+-fi
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+-if test `eval echo '${'$as_ac_File'}'` = yes; then
+-  DEFS_ENT_PATH=$prefix/share/X11/sgml
+-else
+   DEFS_ENT_PATH=
+ 
+-fi
+-
+ 
+ # Extract the first word of "linuxdoc", so it can be a program name with args.
+ set dummy linuxdoc; ac_word=$2
--- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
+++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_NV_VERSION = 2.1.3
+XDRIVER_XF86_VIDEO_NV_VERSION = 2.1.9
 XDRIVER_XF86_VIDEO_NV_SOURCE = xf86-video-nv-$(XDRIVER_XF86_VIDEO_NV_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_NV_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_NV_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
+++ b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_RENDITION_VERSION = 4.1.3
+XDRIVER_XF86_VIDEO_RENDITION_VERSION = 4.2.0
 XDRIVER_XF86_VIDEO_RENDITION_SOURCE = xf86-video-rendition-$(XDRIVER_XF86_VIDEO_RENDITION_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_RENDITION_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_RENDITION_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
+++ b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_S3_VERSION = 0.5.0
+XDRIVER_XF86_VIDEO_S3_VERSION = 0.6.0
 XDRIVER_XF86_VIDEO_S3_SOURCE = xf86-video-s3-$(XDRIVER_XF86_VIDEO_S3_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_S3_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_S3_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
+++ b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_S3VIRGE_VERSION = 1.9.1
+XDRIVER_XF86_VIDEO_S3VIRGE_VERSION = 1.10.1
 XDRIVER_XF86_VIDEO_S3VIRGE_SOURCE = xf86-video-s3virge-$(XDRIVER_XF86_VIDEO_S3VIRGE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_S3VIRGE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_S3VIRGE_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage-2.2.1-cross-compile.patch
+++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage-2.2.1-cross-compile.patch
@ -0,0 +1,27 @@
+--- a/configure.ac	2008-05-21 16:04:23.000000000 -0400
+++ b/configure.ac	2008-06-23 11:41:50.000000000 -0400
+@@ -68,12 +68,18 @@ sdkdir=$(pkg-config --variable=sdkdir xo
+ AC_HEADER_STDC
+ 
+ if test "$DRI" != no; then
+-        AC_CHECK_FILE([${sdkdir}/dri.h],
+-                      [have_dri_h="yes"], [have_dri_h="no"])
+-        AC_CHECK_FILE([${sdkdir}/sarea.h],
+-                      [have_sarea_h="yes"], [have_sarea_h="no"])
+-        AC_CHECK_FILE([${sdkdir}/dristruct.h],
+-                      [have_dristruct_h="yes"], [have_dristruct_h="no"])
+  	if test "$cross_compiling" = "no" ; then
+ 		AC_CHECK_FILE([${sdkdir}/dri.h],
+                        [have_dri_h="yes"], [have_dri_h="no"])
+ 		AC_CHECK_FILE([${sdkdir}/sarea.h],
+                        [have_sarea_h="yes"], [have_sarea_h="no"])
+ 		AC_CHECK_FILE([${sdkdir}/dristruct.h],
+                        [have_dristruct_h="yes"], [have_dristruct_h="no"])
+  	else
+  		have_dri_h="yes"
+  		have_sarea_h="yes"
+  		have_dristruct_h="yes"
+  	fi
+ fi
+ 
+ AC_MSG_CHECKING([whether to include DRI support])
--- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
+++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_SAVAGE_VERSION = 2.1.3
+XDRIVER_XF86_VIDEO_SAVAGE_VERSION = 2.2.1
 XDRIVER_XF86_VIDEO_SAVAGE_SOURCE = xf86-video-savage-$(XDRIVER_XF86_VIDEO_SAVAGE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SAVAGE_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = NO
+XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto

 $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-savage))
--- a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
+++ b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION = 1.4.2
+XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION = 1.6.0
 XDRIVER_XF86_VIDEO_SILICONMOTION_SOURCE = xf86-video-siliconmotion-$(XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SILICONMOTION_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SILICONMOTION_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis-0.10.0.patch
+++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis-0.10.0.patch
--- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
+++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_SIS_VERSION = 0.9.3
+XDRIVER_XF86_VIDEO_SIS_VERSION = 0.10.0
 XDRIVER_XF86_VIDEO_SIS_SOURCE = xf86-video-sis-$(XDRIVER_XF86_VIDEO_SIS_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_SIS_AUTORECONF = NO
+XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto

 $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sis))
--- a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
+++ b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_SISUSB_VERSION = 0.8.1
+XDRIVER_XF86_VIDEO_SISUSB_VERSION = 0.9.0
 XDRIVER_XF86_VIDEO_SISUSB_SOURCE = xf86-video-sisusb-$(XDRIVER_XF86_VIDEO_SISUSB_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SISUSB_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SISUSB_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
+++ b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
@ -7,7 +7,7 @@
 XDRIVER_XF86_VIDEO_SUNFFB_VERSION = 1.1.0
 XDRIVER_XF86_VIDEO_SUNFFB_SOURCE = xf86-video-sunffb-$(XDRIVER_XF86_VIDEO_SUNFFB_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SUNFFB_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_SUNFFB_AUTORECONF = NO
+XDRIVER_XF86_VIDEO_SUNFFB_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_SUNFFB_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto

 $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sunffb))
--- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx-1.4.0.patch
+++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx-1.4.0.patch
--- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
+++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.3.0
+XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.4.0
 XDRIVER_XF86_VIDEO_TDFX_SOURCE = xf86-video-tdfx-$(XDRIVER_XF86_VIDEO_TDFX_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_TDFX_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_TDFX_AUTORECONF = NO
+XDRIVER_XF86_VIDEO_TDFX_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto

 $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-tdfx))
--- a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga-1.1.0-cross-compile.patch
+++ b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga-1.1.0-cross-compile.patch
@ -0,0 +1,30 @@
+--- a/configure	2006-04-07 17:40:13.000000000 -0400
+++ b/configure	2008-06-23 11:54:36.000000000 -0400
+@@ -20326,27 +20326,8 @@ echo "$as_me: Building with package name
+ as_ac_File=`echo "ac_cv_file_$prefix/share/X11/sgml/defs.ent" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $prefix/share/X11/sgml/defs.ent" >&5
+ echo $ECHO_N "checking for $prefix/share/X11/sgml/defs.ent... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_File+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  test "$cross_compiling" = yes &&
+-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+-   { (exit 1); exit 1; }; }
+-if test -r "$prefix/share/X11/sgml/defs.ent"; then
+-  eval "$as_ac_File=yes"
+-else
+-  eval "$as_ac_File=no"
+-fi
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+-if test `eval echo '${'$as_ac_File'}'` = yes; then
+-  DEFS_ENT_PATH=$prefix/share/X11/sgml
+-else
+   DEFS_ENT_PATH=
+ 
+-fi
+ 
+ 
+ # Extract the first word of "linuxdoc", so it can be a program name with args.
--- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
+++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.2.3
+XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.0
 XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_TRIDENT_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
+++ b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_TSENG_VERSION = 1.1.1
+XDRIVER_XF86_VIDEO_TSENG_VERSION = 1.2.0
 XDRIVER_XF86_VIDEO_TSENG_SOURCE = xf86-video-tseng-$(XDRIVER_XF86_VIDEO_TSENG_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_TSENG_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_TSENG_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
+++ b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_V4L_VERSION = 0.1.1
+XDRIVER_XF86_VIDEO_V4L_VERSION = 0.2.0
 XDRIVER_XF86_VIDEO_V4L_SOURCE = xf86-video-v4l-$(XDRIVER_XF86_VIDEO_V4L_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_V4L_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_V4L_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk
+++ b/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk
@ -7,7 +7,7 @@
 XDRIVER_XF86_VIDEO_VIA_VERSION = 0.2.2
 XDRIVER_XF86_VIDEO_VIA_SOURCE = xf86-video-via-$(XDRIVER_XF86_VIDEO_VIA_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_VIA_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_VIA_AUTORECONF = NO
+XDRIVER_XF86_VIDEO_VIA_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_VIA_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto

 $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-via))
--- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
+++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_VMWARE_VERSION = 10.14.1
+XDRIVER_XF86_VIDEO_VMWARE_VERSION = 10.16.2
 XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_VMWARE_AUTORECONF = NO
--- a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
+++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XDRIVER_XF86_VIDEO_VOODOO_VERSION = 1.1.1
+XDRIVER_XF86_VIDEO_VOODOO_VERSION = 1.2.0
 XDRIVER_XF86_VIDEO_VOODOO_SOURCE = xf86-video-voodoo-$(XDRIVER_XF86_VIDEO_VOODOO_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_VOODOO_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_VOODOO_AUTORECONF = NO
--- a/package/x11r7/xproto_inputproto/xproto_inputproto.mk
+++ b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-XPROTO_INPUTPROTO_VERSION = 1.4.2.1
+XPROTO_INPUTPROTO_VERSION = 1.4.3
 XPROTO_INPUTPROTO_SOURCE = inputproto-$(XPROTO_INPUTPROTO_VERSION).tar.bz2
 XPROTO_INPUTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_INPUTPROTO_AUTORECONF = NO
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@ -9,6 +9,21 @@ XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
 XSERVER_XORG_SERVER_AUTORECONF = NO
 XSERVER_XORG_SERVER_INSTALL_STAGING = YES
+
+ifeq ($(strip $(BR2_PACKAGE_XSERVER_xorg)),y)
+XSERVER_XORG_MESA_DEPS:=mesa3d
+XSERVER_XORG_MESA_DIR:=--with-mesa-source="$(BUILD_DIR)/Mesa-6.5.3"
+XSERVER_XORG_ENABLE_MODULAR:=--enable-xorg
+else
+XSERVER_XORG_ENABLE_MODULAR:=--disable-xorg
+endif
+
+ifeq ($(strip $(BR2_PACKAGE_XSERVER_tinyx)),y)
+XSERVER_XORG_ENABLE_KDRIVE:=--enable-kdrive --enable-xfbdev
+else
+XSERVER_XORG_ENABLE_KDRIVE:=--disable-kdrive --disable-xfbdev
+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 \
@ -21,11 +36,12 @@ XSERVER_XORG_SERVER_DEPENDENCIES =  freetype xutil_util-macros xlib_libXfont lib
 									xproto_resourceproto xproto_trapproto xproto_videoproto xproto_xcmiscproto \
 									xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto \
 									xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto \
-									pixman dbus mcookie 
+									pixman dbus $(XSERVER_XORG_MESA_DEPS) mcookie 

-XSERVER_XORG_SERVER_CONF_OPT = --enable-kdrive --enable-xfbdev --enable-freetype --disable-kbd_mode --disable-xorg \
-								--disable-config-hal CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1"
+XSERVER_XORG_SERVER_CONF_OPT = $(XSERVER_XORG_ENABLE_KDRIVE) --enable-freetype $(XSERVER_XORG_ENABLE_MODULAR) \
+								--disable-config-hal $(XSERVER_XORG_MESA_DIR) CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1" 

+XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data
 XSERVER_XORG_SERVER_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install

 # Optional packages
--- a/package/xorg/Config.in
+++ b/package/xorg/Config.in
@ -1,15 +0,0 @@
-config BR2_PACKAGE_XORG
-	depends on BR2_DEPRECATED
-	bool "X.org X Window System"
-	default y if BR2_PACKAGE_XSERVER_xorg
-	select BR2_PACKAGE_ZLIB
-	select BR2_PACKAGE_LIBPNG
-	select BR2_PACKAGE_EXPAT
-	select BR2_PACKAGE_FONTCONFIG
-	select BR2_PACKAGE_PKGCONFIG
-	help
-	  The official X Window system and server.
-
-comment "X.org 6.8.2 X Window System disabled"
-	depends on BR2_PACKAGE_TINYX||BR2_PACKAGE_XORG7
-
--- a/package/xorg/Xserver
+++ b/package/xorg/Xserver
@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/X11/X -br dpms nologo -nolisten tcp
--- a/package/xorg/Xsession
+++ b/package/xorg/Xsession
@ -1,4 +0,0 @@
-#!/bin/sh
-export GDK_USE_XFT=1
-export LANG="en_US.UTF-8"
-/usr/bin/X11/rxvt -bg black -fg gray90
--- a/Show More
+++ b/Show More