xserver-kdrive: patch shuffle and cleanup

* drop unused build-fix-panoramix, devfs and faster-rotated patches
* move some version specific patches into xserver-kdrive-1.1.0
  and move some 1.4 patches that also apply to git into 
  unversioned xserver-kdrive

8 files changed, 0 insertions, 444 deletions

diff --git a/packages/xorg-xserver/xserver-kdrive-1.4/enable-epson.patch b/packages/xorg-xserver/xserver-kdrive-1.4/enable-epson.patch
deleted file mode 100644
index 0fffd71dce..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-1.4/enable-epson.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: xorg-server-1.4/hw/kdrive/Makefile.am
-===================================================================
---- xorg-server-1.4.orig/hw/kdrive/Makefile.am	2007-08-30 01:48:57.000000000 +0200
-+++ xorg-server-1.4/hw/kdrive/Makefile.am	2007-09-06 23:24:29.000000000 +0200
-@@ -1,10 +1,10 @@
- if KDRIVEVESA
--VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga nvidia pm2 r128 \
-+VESA_SUBDIRS = vesa ati chips i810 mach64 mga nvidia pm2 r128 \
-                smi via
- endif
- 
- if BUILD_KDRIVEFBDEVLIB
--FBDEV_SUBDIRS = fbdev
-+FBDEV_SUBDIRS = fbdev epson
- endif
- 
- if XFAKESERVER
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4/fbdev-evdev.patch b/packages/xorg-xserver/xserver-kdrive-1.4/fbdev-evdev.patch
deleted file mode 100644
index 5f9b21b627..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-1.4/fbdev-evdev.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: xorg-server-1.4/hw/kdrive/fbdev/fbinit.c
-===================================================================
---- xorg-server-1.4.orig/hw/kdrive/fbdev/fbinit.c	2007-09-08 21:27:44.000000000 +0200
-+++ xorg-server-1.4/hw/kdrive/fbdev/fbinit.c	2007-09-08 21:28:55.000000000 +0200
-@@ -46,11 +46,13 @@
- 
-     KdAddKeyboardDriver (&LinuxKeyboardDriver);
-     KdAddPointerDriver (&LinuxMouseDriver);
-+    KdAddKeyboardDriver (&LinuxEvdevKeyboardDriver);
-+    KdAddPointerDriver (&LinuxEvdevMouseDriver);
- #ifdef TSLIB
-     KdAddPointerDriver (&TsDriver);
- #endif
- 
--    ki = KdParseKeyboard ("keybd");
-+    ki = KdParseKeyboard ("keyboard");
-     KdAddKeyboard(ki);
- 
-     KdInitInput ();
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4/fix_default_mode.patch b/packages/xorg-xserver/xserver-kdrive-1.4/fix_default_mode.patch
deleted file mode 100644
index edc5146302..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-1.4/fix_default_mode.patch
+++ /dev/null
@@ -1,26 +0,0 @@
----
- hw/kdrive/src/kmode.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/src/kmode.c	2007-05-16 10:30:29.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c	2007-05-16 10:31:08.000000000 +0100
-@@ -106,6 +106,8 @@ const KdMonitorTiming  kdMonitorTimings[
- 		    16,	    120,    176,    KdSyncNegative, /* 37.861 */
- 		    1,	    20,	    24,	    KdSyncNegative, /* 72.809 */
-     },
-+    /* DEFAULT */
-+#define MONITOR_TIMING_DEFAULT	13
-     {	640,	480,	60,	25175,			    /* VESA */
- 		   16,	    48,	    160,    KdSyncNegative, /* 31.469 */
- 		   10,	    33,	    45,	    KdSyncNegative, /* 59.940 */
-@@ -127,8 +129,6 @@ const KdMonitorTiming  kdMonitorTimings[
- 		    16,	    160,    256,    KdSyncPositive, /* 46.875 */
- 		    1,	    21,	    25,	    KdSyncPositive, /* 75.000 */
-     },
--    /* DEFAULT */
--#define MONITOR_TIMING_DEFAULT	9
-     {	800,	600,	72,	50000,			    /* VESA */
- 		    56,	    64,	    240,    KdSyncPositive, /* 48.077 */
- 		    37,	    23,	    66,	    KdSyncPositive, /* 72.188 */
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4/optional-xkb.patch b/packages/xorg-xserver/xserver-kdrive-1.4/optional-xkb.patch
deleted file mode 100644
index 22d8c94c78..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-1.4/optional-xkb.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Index: xorg-server-1.4/Makefile.am
-===================================================================
---- xorg-server-1.4.orig/Makefile.am	2007-08-23 21:04:52.000000000 +0200
-+++ xorg-server-1.4/Makefile.am	2007-09-06 23:19:59.000000000 +0200
-@@ -26,6 +26,10 @@
- GLX_DIR=GL
- endif
- 
-+if XKB
-+XKB_DIR=xkb
-+endif
-+
- if DBE
- DBE_DIR=dbe
- endif
-@@ -42,7 +46,7 @@
- 	randr \
- 	render  \
- 	Xi \
--	xkb \
-+	$(XKB_DIR) \
- 	$(DBE_DIR) \
- 	$(MFB_DIR) \
- 	$(AFB_DIR) \
-Index: xorg-server-1.4/configure.ac
-===================================================================
---- xorg-server-1.4.orig/configure.ac	2007-09-06 07:59:00.000000000 +0200
-+++ xorg-server-1.4/configure.ac	2007-09-06 23:19:19.000000000 +0200
-@@ -514,6 +514,7 @@
- AC_ARG_ENABLE(config-dbus,    AS_HELP_STRING([--enable-config-dbus], [Build D-BUS API support (default: no)]), [CONFIG_DBUS_API=$enableval], [CONFIG_DBUS_API=no])
- AC_ARG_ENABLE(config-hal,     AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto])
- AC_ARG_ENABLE(xfree86-utils,     AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])
-+AC_ARG_ENABLE(xkb,            AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes])
- 
- dnl DDXes.
- AC_ARG_ENABLE(xorg,    	      AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
-@@ -889,12 +890,15 @@
- 
- AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
- 
--AC_DEFINE(XKB, 1, [Build XKB])
--AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
--AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
--REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
--XKB_LIB='$(top_builddir)/xkb/libxkb.la'
--XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
-+AM_CONDITIONAL(XKB, [test "x$XKB" = xyes])
-+if test "x$XKB" = xyes; then
-+	AC_DEFINE(XKB, 1, [Build XKB])
-+	AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
-+	AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
-+	REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
-+	XKB_LIB='$(top_builddir)/xkb/libxkb.la'
-+	XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
-+fi
- 
- AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
-                                         [Do not have 'strcasecmp'.]))
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4/tslib-default-device.patch b/packages/xorg-xserver/xserver-kdrive-1.4/tslib-default-device.patch
deleted file mode 100644
index c1bc49f58e..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-1.4/tslib-default-device.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: xorg-server-1.4/hw/kdrive/linux/tslib.c
-===================================================================
---- xorg-server-1.4.orig/hw/kdrive/linux/tslib.c	2007-09-08 19:58:08.000000000 +0200
-+++ xorg-server-1.4/hw/kdrive/linux/tslib.c	2007-09-08 19:58:09.000000000 +0200
-@@ -121,6 +121,10 @@
- 
-     private->raw_event_hook = NULL;
-     private->raw_event_closure = NULL;
-+    if (!pi->path) {
-+        pi->path = "/dev/input/touchscreen0";
-+        ErrorF("[tslib/TslibEnable] no device path given, trying %s\n", pi->path);
-+    }
-     private->tsDev = ts_open(pi->path, 0);
-     private->fd = ts_fd(private->tsDev);
-     if (!private->tsDev || ts_config(private->tsDev) || private->fd < 0) {
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4/w100-new-input-world-order.patch b/packages/xorg-xserver/xserver-kdrive-1.4/w100-new-input-world-order.patch
deleted file mode 100644
index 239ae0bb67..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-1.4/w100-new-input-world-order.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: xorg-server-1.4/hw/kdrive/w100/ati_stub.c
-===================================================================
---- xorg-server-1.4.orig/hw/kdrive/w100/ati_stub.c	2007-09-08 21:40:26.000000000 +0200
-+++ xorg-server-1.4/hw/kdrive/w100/ati_stub.c	2007-09-08 22:04:27.000000000 +0200
-@@ -74,10 +74,20 @@
- void
- InitInput(int argc, char **argv)
- {
--    KdInitInput(&LinuxMouseFuncs, &LinuxKeyboardFuncs);
--#ifdef TOUCHSCREEN
--    KdAddMouseDriver(&TsFuncs);
-+    KdKeyboardInfo *ki;
-+
-+    KdAddKeyboardDriver (&LinuxKeyboardDriver);
-+    KdAddPointerDriver (&LinuxMouseDriver);
-+    KdAddKeyboardDriver (&LinuxEvdevKeyboardDriver);
-+    KdAddPointerDriver (&LinuxEvdevMouseDriver);
-+#ifdef TSLIB
-+    KdAddPointerDriver (&TsDriver);
- #endif
-+
-+    ki = KdParseKeyboard ("keyboard");
-+    KdAddKeyboard(ki);
-+
-+    KdInitInput ();
- }
- 
- void
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4/xcalibrate-new-input-world-order.patch b/packages/xorg-xserver/xserver-kdrive-1.4/xcalibrate-new-input-world-order.patch
deleted file mode 100644
index 2cc9e60d8d..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-1.4/xcalibrate-new-input-world-order.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-CRUDE HACK ALERT: this patch adds a new device control (DEVICE_RAWEVENT) 
-which cannot be exported in the protocol because the xDeviceRaweventCtl 
-carries a C pointer to the tslib event hook. For lack of a better idea,
-I added this to get the event hook pointer from Xext/xcalibrate.c into
-tslib.c, where the now-private _raw_event_hook and _raw_event_closure
-pointers are manipulated instead of, like before, in the Xcalibrate 
-extension itself.
-
-Index: xorg-server-1.4/Xext/xcalibrate.c
-===================================================================
---- xorg-server-1.4.orig/Xext/xcalibrate.c	2007-09-08 13:22:55.000000000 +0200
-+++ xorg-server-1.4/Xext/xcalibrate.c	2007-09-08 16:03:17.000000000 +0200
-@@ -33,14 +33,14 @@
- #include "os.h"
- #include "dixstruct.h"
- #include "extnsionst.h"
-+#include "inputstr.h"				/* for inputInfo */
- #include "swaprep.h"
- 
-+#include <X11/extensions/XI.h>			/* for XI_TOUCHSCREEN */
-+#include <X11/extensions/XIproto.h>		/* for xDeviceCtl */
- #include <X11/extensions/xcalibrateproto.h>
- #include <X11/extensions/xcalibratewire.h>
- 
--extern void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure);
--extern void *tslib_raw_event_closure;
--
- static CARD8	XCalibrateReqCode;
- int		XCalibrateEventBase;
- int		XCalibrateReqBase;
-@@ -64,6 +64,31 @@
-     WriteEventsToClient (pClient, 1, (xEvent *) &ev);
- }
- 
-+#define DEVICE_RAWEVENT 6
-+typedef struct {
-+    CARD16          control B16;
-+    CARD16          length  B16;
-+    void           *hook;
-+} xDeviceRaweventCtl;
-+
-+static void
-+xcalibrate_set_event_hook (void *hook, ClientPtr client)
-+{
-+  DeviceIntPtr devtmp;
-+  Atom xiclass;
-+  xDeviceRaweventCtl rawevent;
-+
-+  rawevent.control = DEVICE_RAWEVENT;
-+  rawevent.length = sizeof(rawevent);
-+  rawevent.hook = hook;
-+
-+  xiclass = MakeAtom(XI_TOUCHSCREEN, strlen(XI_TOUCHSCREEN), 1);
-+
-+  for (devtmp = inputInfo.devices; devtmp; devtmp = devtmp->next)
-+    if (devtmp->type == xiclass)
-+      ChangeDeviceControl(client, devtmp, (xDeviceCtl *) &rawevent);
-+}
-+
- static int
- ProcXCalibrateQueryVersion (ClientPtr client)
- {
-@@ -124,8 +149,7 @@
- 	{
- 	  /* Start calibrating.  */
- 	  xcalibrate_client = client;
--	  tslib_raw_event_hook = xcalibrate_event_hook;
--	  tslib_raw_event_closure = client;
-+	  xcalibrate_set_event_hook(xcalibrate_event_hook, client);
- 	  rep.status = GrabSuccess;
- 	}
-       else
-@@ -139,8 +163,7 @@
- 	{
- 	  /* Stop calibrating.  */
- 	  xcalibrate_client = NULL;
--	  tslib_raw_event_hook = NULL;
--	  tslib_raw_event_closure = NULL;
-+	  xcalibrate_set_event_hook(NULL, NULL);
- 	  rep.status = GrabSuccess;
- 
- 	  /* Cycle input off and on to reload configuration.  */
-@@ -277,8 +300,7 @@
-       {
- 	/* Stop calibrating.  */
- 	xcalibrate_client = NULL;
--	tslib_raw_event_hook = NULL;
--	tslib_raw_event_closure = NULL;
-+	xcalibrate_set_event_hook(NULL, NULL);
-       }
- }
- 
-Index: xorg-server-1.4/hw/kdrive/linux/tslib.c
-===================================================================
---- xorg-server-1.4.orig/hw/kdrive/linux/tslib.c	2007-09-08 14:46:41.000000000 +0200
-+++ xorg-server-1.4/hw/kdrive/linux/tslib.c	2007-09-08 16:10:57.000000000 +0200
-@@ -56,6 +56,13 @@
-     int phys_screen;
- };
- 
-+void
-+tslib_set_raw_event_hook(KdPointerInfo *pi, void *hook, void *closure)
-+{
-+	struct TslibPrivate *private = pi->driverPrivate;
-+	private->raw_event_hook = hook;
-+	private->raw_event_closure = closure;
-+}
- 
- static void
- TsRead (int fd, void *closure)
-Index: xorg-server-1.4/hw/kdrive/src/kinput.c
-===================================================================
---- xorg-server-1.4.orig/hw/kdrive/src/kinput.c	2007-09-08 14:45:01.000000000 +0200
-+++ xorg-server-1.4/hw/kdrive/src/kinput.c	2007-09-08 16:09:32.000000000 +0200
-@@ -2389,10 +2389,19 @@
-     return BadMatch;
- }
- 
-+#define DEVICE_RAWEVENT 6
-+typedef struct {
-+    CARD16          control B16;
-+    CARD16          length  B16;
-+    void           *hook;
-+} xDeviceRaweventCtl;
-+
- int
- ChangeDeviceControl(register ClientPtr client, DeviceIntPtr pDev,
-                         xDeviceCtl *control)
- {
-+    KdPointerInfo *pi;
-+
-     switch (control->control) {
-     case DEVICE_RESOLUTION:
-         /* FIXME do something more intelligent here */
-@@ -2406,6 +2415,24 @@
-     case DEVICE_ENABLE:
-         return Success;
- 
-+    case DEVICE_RAWEVENT:
-+        if (!pDev)
-+	    return BadImplementation;
-+
-+        for (pi = kdPointers; pi; pi = pi->next) {
-+            if (pi->dixdev && pi->dixdev->id == pDev->id)
-+                break;
-+        }
-+
-+        if (!pi || !pi->dixdev || pi->dixdev->id != pDev->id) {
-+            ErrorF("[ChangeDeviceControl] Failed to find pointer for device %d!\n",
-+                   pDev->id);
-+            return BadImplementation;
-+        }
-+
-+        tslib_set_raw_event_hook(pi, ((xDeviceRaweventCtl *)control)->hook, client);
-+	return Success;
-+
-     default:
-         return BadMatch;
-     }
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4/xcalibrate_coords.patch b/packages/xorg-xserver/xserver-kdrive-1.4/xcalibrate_coords.patch
deleted file mode 100644
index 7f4ec09d68..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-1.4/xcalibrate_coords.patch
+++ /dev/null
@@ -1,122 +0,0 @@
----
- Xext/xcalibrate.c      |   47 ++++++++++++++++++++++++++++++++++++++++++++++-
- hw/kdrive/src/kdrive.h |    3 +++
- hw/kdrive/src/kinput.c |   12 ++++++++++++
- 3 files changed, 61 insertions(+), 1 deletion(-)
-
-Index: xorg-server-1.4/Xext/xcalibrate.c
-===================================================================
---- xorg-server-1.4.orig/Xext/xcalibrate.c	2007-08-23 21:04:52.000000000 +0200
-+++ xorg-server-1.4/Xext/xcalibrate.c	2007-09-06 23:27:40.000000000 +0200
-@@ -164,7 +164,6 @@
-   return (client->noClientException);
- }
- 
--
- static int
- SProcXCalibrateSetRawMode (ClientPtr client)
- {
-@@ -178,6 +177,47 @@
-   return ProcXCalibrateSetRawMode(client);
- }
- 
-+static int
-+ProcXCalibrateScreenToCoord (ClientPtr client)
-+{
-+  REQUEST(xXCalibrateScreenToCoordReq);
-+  xXCalibrateScreenToCoordReply rep;
-+
-+  REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq);
-+
-+  memset (&rep, 0, sizeof (rep));
-+  rep.type = X_Reply;
-+  rep.sequenceNumber = client->sequence;
-+  rep.x = stuff->x;
-+  rep.y = stuff->y;
-+
-+  KdScreenToPointerCoords(&rep.x, &rep.y);
-+
-+  if (client->swapped)
-+    {
-+      int n;
-+
-+      swaps (&rep.x, n);
-+      swaps (&rep.y, n);
-+    }
-+  WriteToClient(client, sizeof (rep), (char *) &rep);
-+  return (client->noClientException);
-+}
-+
-+static int
-+SProcXCalibrateScreenToCoord (ClientPtr client)
-+{
-+  REQUEST(xXCalibrateScreenToCoordReq);
-+  int n;
-+
-+  REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq);
-+
-+  swaps(&stuff->x, n);
-+  swaps(&stuff->y, n);
-+
-+  return ProcXCalibrateScreenToCoord(client);
-+}
-+
- static void
- XCalibrateResetProc (ExtensionEntry *extEntry) 
- { 
-@@ -192,6 +232,9 @@
-         return ProcXCalibrateQueryVersion(client);
-     case X_XCalibrateRawMode:
-         return ProcXCalibrateSetRawMode(client);
-+    case X_XCalibrateScreenToCoord:
-+        return ProcXCalibrateScreenToCoord(client);
-+
-     default: break;
-     }
- 
-@@ -211,6 +254,8 @@
-         return SProcXCalibrateQueryVersion(client);
-     case X_XCalibrateRawMode:
-         return SProcXCalibrateSetRawMode(client);
-+    case X_XCalibrateScreenToCoord:
-+        return SProcXCalibrateScreenToCoord(client);
- 
-     default: break;
-     }
-Index: xorg-server-1.4/hw/kdrive/src/kdrive.h
-===================================================================
---- xorg-server-1.4.orig/hw/kdrive/src/kdrive.h	2007-08-23 21:04:53.000000000 +0200
-+++ xorg-server-1.4/hw/kdrive/src/kdrive.h	2007-09-06 23:28:50.000000000 +0200
-@@ -848,6 +848,9 @@
- KdSetPointerMatrix (KdPointerMatrix *pointer);
- 
- void
-+KdScreenToPointerCoords (int *x, int *y);
-+
-+void
- KdComputePointerMatrix (KdPointerMatrix *pointer, Rotation randr, int width, int height);
-     
- void
-Index: xorg-server-1.4/hw/kdrive/src/kinput.c
-===================================================================
---- xorg-server-1.4.orig/hw/kdrive/src/kinput.c	2007-08-23 21:04:53.000000000 +0200
-+++ xorg-server-1.4/hw/kdrive/src/kinput.c	2007-09-06 23:30:54.000000000 +0200
-@@ -592,6 +592,18 @@
- }
- 
- void
-+KdScreenToPointerCoords (int *x, int *y)
-+{
-+    int	(*m)[3] = kdPointerMatrix.matrix;
-+    int div = m[0][1] * m[1][0] - m[1][1] * m[0][0];
-+    int sx = *x;
-+    int sy = *y;
-+
-+    *x = (m[0][1] * sy - m[0][1] * m[1][2] + m[1][1] * m[0][2] - m[1][1] * sx) / div;
-+    *y = (m[1][0] * sx + m[0][0] * m[1][2] - m[1][0] * m[0][2] - m[0][0] * sy) / div;
-+}
-+
-+void
- KdComputePointerMatrix (KdPointerMatrix *m, Rotation randr, int width,
-                         int height)
- {