Accepting request 19080 from X11:XOrg

Copy from X11:XOrg/xorg-x11-server based on submit request 19080 from user sndirsch OBS-URL: https://build.opensuse.org/request/show/19080 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=138
2009-08-28 18:30:20 +00:00 · 2009-08-28 18:30:20 +00:00 · de140e0677
commit de140e0677
parent 1753df727c
30 changed files with 323 additions and 383 deletions
--- a/0001-Unclaim-PCI-slot-if-driver-probing-fails.patch
+++ b/0001-Unclaim-PCI-slot-if-driver-probing-fails.patch
@ -12,10 +12,10 @@ available. Later on VESA cannot claim the device.
 hw/xfree86/common/xf86pciBus.c |   19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletions(-)

-Index: xorg-server-1.6.3/hw/xfree86/common/xf86.h
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86.h
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/common/xf86.h
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86.h
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86.h
+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86.h
@@ -97,6 +97,7 @@ extern Bool xf86DRI2Enabled(void);
 Bool xf86CheckPciSlot( const struct pci_device * );
 int xf86ClaimPciSlot( struct pci_device *, DriverPtr drvp,
@ -24,11 +24,11 @@ Index: xorg-server-1.6.3/hw/xfree86/common/xf86.h
 Bool xf86ParsePciBusString(const char *busID, int *bus, int *device,
 			   int *func);
 Bool xf86ComparePciBusString(const char *busID, int bus, int device, int func);
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86Init.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Init.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Init.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86Init.c
-@@ -525,7 +525,8 @@ probe_devices_from_device_sections(Drive
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Init.c
+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Init.c
+@@ -514,7 +514,8 @@ probe_devices_from_device_sections(Drive
 		    if ((*drvp->PciProbe)(drvp, entry, pPci,
 					  devices[j].match_data)) {
 			foundScreen = TRUE;
@ -38,10 +38,10 @@ Index: xorg-server-1.6.3/hw/xfree86/common/xf86Init.c
 		}
 
 		break;
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86pciBus.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86pciBus.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/common/xf86pciBus.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86pciBus.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86pciBus.c
+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86pciBus.c
@@ -753,6 +753,25 @@ xf86ClaimPciSlot(struct pci_device * d,
 }
 
--- a/0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch
+++ b/0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch
@ -10,10 +10,10 @@ even if idev is null. This takes down the xserver hard in some cases
 hw/xfree86/common/xf86Xinput.c |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

-Index: xorg-server-1.6.3/hw/xfree86/common/xf86Xinput.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Xinput.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Xinput.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86Xinput.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Xinput.c
+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Xinput.c
@@ -679,17 +679,20 @@ DeleteInputDeviceRequest(DeviceIntPtr pD
         else
             xf86DeleteInput(pInfo, 0);
--- a/0001-config-don-t-shutdown-the-libhal-ctx-if-it-failed-to.patch
+++ b/0001-config-don-t-shutdown-the-libhal-ctx-if-it-failed-to.patch
@ -1,61 +0,0 @@
-From e9600d53af7bf72faef29dc5bfaa617b9bb1850c Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Fri, 14 Aug 2009 09:48:45 +1000
-Subject: [PATCH] config: don't shutdown the libhal ctx if it failed to initialize.
-
---
- config/hal.c |   21 +++++++++++----------
- 1 files changed, 11 insertions(+), 10 deletions(-)
-
-diff --git a/config/hal.c b/config/hal.c
-index 59bff66..28f55a0 100644
--- a/config/hal.c
-+++ b/config/hal.c
-@@ -489,13 +489,13 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info)
- 
-     if (!libhal_ctx_set_dbus_connection(info->hal_ctx, info->system_bus)) {
-         LogMessage(X_ERROR, "config/hal: couldn't associate HAL context with bus\n");
-        goto out_ctx;
-+        goto out_err;
-     }
-     if (!libhal_ctx_init(info->hal_ctx, &error)) {
-         LogMessage(X_ERROR, "config/hal: couldn't initialise context: %s (%s)\n",
- 		   error.name ? error.name : "unknown error",
- 		   error.message ? error.message : "null");
-        goto out_ctx;
-+        goto out_err;
-     }
-     if (!libhal_device_property_watch_all(info->hal_ctx, &error)) {
-         LogMessage(X_ERROR, "config/hal: couldn't watch all properties: %s (%s)\n",
-@@ -526,19 +526,20 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info)
- out_ctx:
-     dbus_error_free(&error);
- 
-    if (info->hal_ctx) {
-        if (!libhal_ctx_shutdown(info->hal_ctx, &error)) {
-            LogMessage(X_WARNING, "config/hal: couldn't shut down context: %s (%s)\n",
-		       error.name ? error.name : "unknown error",
-		       error.message ? error.message : "null");
-            dbus_error_free(&error);
-        }
-        libhal_ctx_free(info->hal_ctx);
-+    if (!libhal_ctx_shutdown(info->hal_ctx, &error)) {
-+        LogMessage(X_WARNING, "config/hal: couldn't shut down context: %s (%s)\n",
-+                error.name ? error.name : "unknown error",
-+                error.message ? error.message : "null");
-+        dbus_error_free(&error);
-     }
- 
- out_err:
-     dbus_error_free(&error);
- 
-+    if (info->hal_ctx) {
-+        libhal_ctx_free(info->hal_ctx);
-+    }
-+
-     info->hal_ctx = NULL;
-     info->system_bus = NULL;
- 
-- 
-1.6.3.rc1.2.g0164.dirty
-
--- a/acpi_events.diff
+++ b/acpi_events.diff
@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/os-support/linux/lnx_apm.c
+Index: xorg-server-1.6.3.901/hw/xfree86/os-support/linux/lnx_apm.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/os-support/linux/lnx_apm.c
-+++ xorg-server-1.6.3/hw/xfree86/os-support/linux/lnx_apm.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/os-support/linux/lnx_apm.c
+++ xorg-server-1.6.3.901/hw/xfree86/os-support/linux/lnx_apm.c
@@ -189,7 +189,7 @@ lnxAPMOpen(void)
 	    close(pfd);
 	xf86PMGetEventFromOs = lnxPMGetEventFromOs;
--- a/bitmap_always_unscaled.diff
+++ b/bitmap_always_unscaled.diff
@ -23,10 +23,10 @@ Fabian and Stefan Dirsch.
 hw/xfree86/utils/xorgconfig/xorgconfig.c |    4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

-Index: xorg-server-1.6.3/configure.ac
+Index: xorg-server-1.6.3.901/configure.ac
 ===================================================================
--- xorg-server-1.6.3.orig/configure.ac
-+++ xorg-server-1.6.3/configure.ac
+--- xorg-server-1.6.3.901.orig/configure.ac
+++ xorg-server-1.6.3.901/configure.ac
@@ -466,7 +466,7 @@ AC_ARG_WITH(builderstring,   AS_HELP_STR
 AC_ARG_WITH(fontdir,         AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]),
                                 [ FONTDIR="$withval" ],
@ -36,10 +36,10 @@ Index: xorg-server-1.6.3/configure.ac
 case $host_os in
 	darwin*)    DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
 esac
-Index: xorg-server-1.6.3/hw/xfree86/Makefile.am
+Index: xorg-server-1.6.3.901/hw/xfree86/Makefile.am
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/Makefile.am
-+++ xorg-server-1.6.3/hw/xfree86/Makefile.am
+--- xorg-server-1.6.3.901.orig/hw/xfree86/Makefile.am
+++ xorg-server-1.6.3.901/hw/xfree86/Makefile.am
@@ -100,11 +100,11 @@ dist_options_DATA = Options
 
 CPP_FILES_FLAGS = \
--- a/bug-507190_xorg-x11-server-bnc381139-randr-reprobe-on-unsuspend.diff
+++ b/bug-507190_xorg-x11-server-bnc381139-randr-reprobe-on-unsuspend.diff
@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/modes/xf86RandR12.c
+Index: xorg-server-1.6.3.901/hw/xfree86/modes/xf86RandR12.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/modes/xf86RandR12.c
-+++ xorg-server-1.6.3/hw/xfree86/modes/xf86RandR12.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/modes/xf86RandR12.c
+++ xorg-server-1.6.3.901/hw/xfree86/modes/xf86RandR12.c
@@ -55,6 +55,13 @@ typedef struct _xf86RandR12Info {
     int				    pointerY;
     Rotation			    rotation; /* current mode */
--- a/cache-xkbcomp-output-for-fast-start-up.patch
+++ b/cache-xkbcomp-output-for-fast-start-up.patch
@ -14,10 +14,10 @@ Signed-off-by: Yan Li <yan.i.li@intel.com>
 xkb/ddxLoad.c       |  192 +++++++++++++++++++++++++++++++++++++++++---------
 3 files changed, 164 insertions(+), 42 deletions(-)

-Index: xorg-server-1.6.3/configure.ac
+Index: xorg-server-1.6.3.901/configure.ac
 ===================================================================
--- xorg-server-1.6.3.orig/configure.ac
-+++ xorg-server-1.6.3/configure.ac
+--- xorg-server-1.6.3.901.orig/configure.ac
+++ xorg-server-1.6.3.901/configure.ac
@@ -476,9 +476,9 @@ AC_ARG_WITH(default-font-path, AS_HELP_S
 AC_ARG_WITH(xkb-path,         AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
 				[ XKBPATH="$withval" ],
@ -39,10 +39,10 @@ Index: xorg-server-1.6.3/configure.ac
 fi
 
 # XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
-Index: xorg-server-1.6.3/xkb/README.compiled
+Index: xorg-server-1.6.3.901/xkb/README.compiled
 ===================================================================
--- xorg-server-1.6.3.orig/xkb/README.compiled
-+++ xorg-server-1.6.3/xkb/README.compiled
+--- xorg-server-1.6.3.901.orig/xkb/README.compiled
+++ xorg-server-1.6.3.901/xkb/README.compiled
@@ -4,10 +4,10 @@ current keymap and/or any scratch keymap
 or some other tool might destroy or replace the files in this directory,
 so it is not a safe place to store compiled keymaps for long periods of
@ -58,10 +58,10 @@ Index: xorg-server-1.6.3/xkb/README.compiled
 
 Unless the X server is modified, sharing this directory between servers on
 different hosts could cause problems.
-Index: xorg-server-1.6.3/xkb/ddxLoad.c
+Index: xorg-server-1.6.3.901/xkb/ddxLoad.c
 ===================================================================
--- xorg-server-1.6.3.orig/xkb/ddxLoad.c
-+++ xorg-server-1.6.3/xkb/ddxLoad.c
+--- xorg-server-1.6.3.901.orig/xkb/ddxLoad.c
+++ xorg-server-1.6.3.901/xkb/ddxLoad.c
@@ -32,6 +32,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <xkb-config.h>
 #endif
--- a/dpms_screensaver.diff
+++ b/dpms_screensaver.diff
@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86DPMS.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86DPMS.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/common/xf86DPMS.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86DPMS.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86DPMS.c
+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86DPMS.c
@@ -160,7 +160,8 @@ DPMSSet(ClientPtr client, int level)
 	rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverActive);
 	if (rc != Success)
--- a/edit_data_sanity_check.diff
+++ b/edit_data_sanity_check.diff
@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/modes/xf86Crtc.c
+Index: xorg-server-1.6.3.901/hw/xfree86/modes/xf86Crtc.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/modes/xf86Crtc.c
-+++ xorg-server-1.6.3/hw/xfree86/modes/xf86Crtc.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/modes/xf86Crtc.c
+++ xorg-server-1.6.3.901/hw/xfree86/modes/xf86Crtc.c
@@ -2800,7 +2800,13 @@ xf86OutputSetEDID (xf86OutputPtr output,
 	for (i = 0; i < 4; i++) {
 	    if (edid_mon->det_mon[i].type == DT &&
--- a/events.diff
+++ b/events.diff
@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86Events.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Events.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Events.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86Events.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Events.c
+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Events.c
@@ -518,22 +518,26 @@ xf86VTSwitch()
      * Keep the order: Disable Device > LeaveVT
      *                        EnterVT > EnableDevice
--- a/exa-greedy.diff
+++ b/exa-greedy.diff
@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/exa/exa_migration.c
+Index: xorg-server-1.6.3.901/exa/exa_migration.c
 ===================================================================
--- xorg-server-1.6.3.orig/exa/exa_migration.c
-+++ xorg-server-1.6.3/exa/exa_migration.c
+--- xorg-server-1.6.3.901.orig/exa/exa_migration.c
+++ xorg-server-1.6.3.901/exa/exa_migration.c
@@ -463,7 +463,11 @@ exaMigrateTowardFb (ExaMigrationPtr migr
 	exaDoMoveInPixmap(migrate);
     }
--- a/fbdev_fallback_fail_fix.diff
+++ b/fbdev_fallback_fail_fix.diff
@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86Bus.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Bus.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Bus.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86Bus.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Bus.c
+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Bus.c
@@ -429,7 +429,7 @@ xf86GetEntityInfo(int entityIndex)
     EntityInfoPtr pEnt;
     int i;
@ -32,10 +32,10 @@ Index: xorg-server-1.6.3/hw/xfree86/common/xf86Bus.c
 /*
  * xf86PostProbe() -- Allocate all non conflicting resources
  * This function gets called by xf86Init().
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86Priv.h
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Priv.h
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Priv.h
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86Priv.h
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Priv.h
+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Priv.h
@@ -123,6 +123,7 @@ extern RootWinPropPtr *xf86RegisteredPro
 
 /* xf86Bus.c */
@ -44,10 +44,10 @@ Index: xorg-server-1.6.3/hw/xfree86/common/xf86Priv.h
 void xf86BusProbe(void);
 void xf86ChangeBusIndex(int oldIndex, int newIndex);
 void xf86AccessInit(void);
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86fbBus.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86fbBus.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/common/xf86fbBus.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86fbBus.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86fbBus.c
+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86fbBus.c
@@ -58,7 +58,10 @@ xf86ClaimFbSlot(DriverPtr drvp, int chip
 {
     EntityPtr p;
--- a/fixed-SYNC-extension-trigger-BlockHandler-test.diff
+++ b/fixed-SYNC-extension-trigger-BlockHandler-test.diff
@ -24,10 +24,10 @@ Subject: [PATCH] Fixed SYNC extension trigger BlockHandler test.
    idle counter to trigger.
    This fixes a problem introduced with commit 1f4fb022 where an idle counter
    expires unnoticed.
-Index: xorg-server-1.6.3/Xext/sync.c
+Index: xorg-server-1.6.3.901/Xext/sync.c
 ===================================================================
--- xorg-server-1.6.3.orig/Xext/sync.c
-+++ xorg-server-1.6.3/Xext/sync.c
+--- xorg-server-1.6.3.901.orig/Xext/sync.c
+++ xorg-server-1.6.3.901/Xext/sync.c
@@ -222,8 +222,7 @@ SyncCreateCounter(
 );
 
@ -93,7 +93,7 @@ Index: xorg-server-1.6.3/Xext/sync.c
 {
     SyncTriggerList *pCur;
     SyncTrigger *pTrigger;
-@@ -1136,60 +1135,51 @@ SyncComputeBracketValues(pCounter, start
+@@ -1136,58 +1135,53 @@ SyncComputeBracketValues(pCounter, start
     if (ct == XSyncCounterNeverChanges)
 	return;
 
@ -132,11 +132,12 @@ Index: xorg-server-1.6.3/Xext/sync.c
 -		pnewltval = &psci->bracket_less;
 -	    }
 -	}
-	else if ( (pTrigger->test_type == XSyncPositiveTransition &&
+-	else if (pTrigger->test_type == XSyncNegativeTransition &&
 -		   ct != XSyncCounterNeverIncreases)
-		 ||
-		 (pTrigger->test_type == XSyncNegativeTransition &&
-		  ct != XSyncCounterNeverDecreases)
+-	{
+-	    if (XSyncValueGreaterThan(pCounter->value, pTrigger->test_value) &&
+-		XSyncValueGreaterThan(pTrigger->test_value, psci->bracket_less))
+-	    {
 +
 +        if ( ( (pTrigger->test_type == XSyncPositiveComparison)
 +	       && ( XSyncValueGreaterOrEqual(pCounter->value, pTrigger->test_value)
@ -150,28 +151,13 @@ Index: xorg-server-1.6.3/Xext/sync.c
 +		      || ( ct != XSyncCounterNeverIncreases
 +			  && XSyncValueLessThan(pCounter->value, pTrigger->test_value))
 +		      )
- 		 )
-	{
-	    if (XSyncValueLessThan(pCounter->value, pTrigger->test_value))
-	    {
-		if (XSyncValueLessThan(pTrigger->test_value,
-				       psci->bracket_greater))
-		{
-		    psci->bracket_greater = pTrigger->test_value;
-		    pnewgtval = &psci->bracket_greater;
-		}
-		else
-		if (XSyncValueGreaterThan(pTrigger->test_value,
-					  psci->bracket_less))
-		{
-		    psci->bracket_less = pTrigger->test_value;
-		    pnewltval = &psci->bracket_less;
+		 )
 +	     ) {
 +	      if (XSyncValueLessThan(pTrigger->test_value,
 +				     psci->bracket_greater)) {
 +		  psci->bracket_greater = pTrigger->test_value;
 +		  pnewgtval = &psci->bracket_greater;
- 		}
+		}
 +	} else if ( ( (pTrigger->test_type == XSyncNegativeComparison)
 +		      && ( XSyncValueLessOrEqual(pCounter->value, pTrigger->test_value)
 +			   || (ct != XSyncCounterNeverDecreases
@ -188,12 +174,24 @@ Index: xorg-server-1.6.3/Xext/sync.c
 +		    ) {
 +	    if (XSyncValueGreaterThan(pTrigger->test_value,
 +				      psci->bracket_less)) {
-+		psci->bracket_less = pTrigger->test_value;
-+		pnewltval = &psci->bracket_less;
+ 		psci->bracket_less = pTrigger->test_value;
+ 		pnewltval = &psci->bracket_less;
 	    }
 	}
+-        else if (pTrigger->test_type == XSyncPositiveTransition &&
+-		  ct != XSyncCounterNeverDecreases)
+-	{
+-	    if (XSyncValueLessThan(pCounter->value, pTrigger->test_value) &&
+-		XSyncValueLessThan(pTrigger->test_value, psci->bracket_greater))
+-	    {
+-		psci->bracket_greater = pTrigger->test_value;
+-		pnewgtval = &psci->bracket_greater;
+-	    }
+-	}
     } /* end for each trigger */
-@@ -2545,11 +2535,17 @@ IdleTimeQueryValue (pointer pCounter, CA
+ 
+     if (pnewgtval || pnewltval)
+@@ -2541,11 +2535,17 @@ IdleTimeQueryValue (pointer pCounter, CA
 }
 
 static void
@ -216,7 +214,7 @@ Index: xorg-server-1.6.3/Xext/sync.c
 
     if (!pIdleTimeValueLess && !pIdleTimeValueGreater)
 	return;
-@@ -2567,46 +2563,57 @@ IdleTimeBlockHandler(pointer env, struct
+@@ -2563,46 +2563,57 @@ IdleTimeBlockHandler(pointer env, struct
 	 * want level or edge trigger.  Check the trigger list against the
 	 * current idle time, and if any succeed, bomb out of select()
 	 * immediately so we can reschedule.
--- a/keyrelease-1.5.2.diff
+++ b/keyrelease-1.5.2.diff
@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/xkb/xkbPrKeyEv.c
+Index: xorg-server-1.6.3.901/xkb/xkbPrKeyEv.c
 ===================================================================
--- xorg-server-1.6.3.orig/xkb/xkbPrKeyEv.c
-+++ xorg-server-1.6.3/xkb/xkbPrKeyEv.c
+--- xorg-server-1.6.3.901.orig/xkb/xkbPrKeyEv.c
+++ xorg-server-1.6.3.901/xkb/xkbPrKeyEv.c
@@ -95,17 +95,6 @@ int             xiEvent;
 		else if ((xE->u.u.type==KeyRelease || 
                             xE->u.u.type == DeviceKeyRelease) &&
--- a/libdri_noPanoramiXExtension_symbol.patch
+++ b/libdri_noPanoramiXExtension_symbol.patch
@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/dri/dri.c
+Index: xorg-server-1.6.3.901/hw/xfree86/dri/dri.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/dri/dri.c
-+++ xorg-server-1.6.3/hw/xfree86/dri/dri.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/dri/dri.c
+++ xorg-server-1.6.3.901/hw/xfree86/dri/dri.c
@@ -75,7 +75,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)
 
--- a/loadmod-bug197195.diff
+++ b/loadmod-bug197195.diff
@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/loader/loadmod.c
+Index: xorg-server-1.6.3.901/hw/xfree86/loader/loadmod.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/loader/loadmod.c
-+++ xorg-server-1.6.3/hw/xfree86/loader/loadmod.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/loader/loadmod.c
+++ xorg-server-1.6.3.901/hw/xfree86/loader/loadmod.c
@@ -401,8 +401,8 @@ FindModuleInSubdir(const char *dirpath,
     while ((direntry = readdir(dir))) {
         if (direntry->d_name[0] == '.')
--- a/moblin-xorg-x11-nonroot-vesa.patch
+++ b/moblin-xorg-x11-nonroot-vesa.patch
@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86AutoConfig.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86AutoConfig.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/common/xf86AutoConfig.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86AutoConfig.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86AutoConfig.c
+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86AutoConfig.c
@@ -545,7 +545,8 @@ listPossibleVideoDrivers(char *matches[]
 #if !defined(__linux__) && defined(__sparc__)
 	matches[i++] = xnfstrdup("wsfb");
--- a/p_xnest-ignore-getimage-errors.diff
+++ b/p_xnest-ignore-getimage-errors.diff
@ -1,7 +1,7 @@
-Index: build-3Jvc9fE/xorg-server-1.6.3/hw/xnest/GCOps.c
+Index: build-GucBkyZ/xorg-server-1.6.3.901/hw/xnest/GCOps.c
 ===================================================================
--- build-3Jvc9fE/xorg-server-1.6.3.orig/hw/xnest/GCOps.c
-+++ build-3Jvc9fE/xorg-server-1.6.3/hw/xnest/GCOps.c
+--- build-GucBkyZ/xorg-server-1.6.3.901.orig/hw/xnest/GCOps.c
+++ build-GucBkyZ/xorg-server-1.6.3.901/hw/xnest/GCOps.c
@@ -94,6 +94,13 @@ xnestPutImage(DrawablePtr pDrawable, GCP
   }
 }
--- a/randr1_1-sig11.diff
+++ b/randr1_1-sig11.diff
@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86RandR.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86RandR.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/common/xf86RandR.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86RandR.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86RandR.c
+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86RandR.c
@@ -246,6 +246,9 @@ xf86RandRSetConfig (ScreenPtr		pScreen,
     Bool		    useVirtual = FALSE;
     Rotation		    oldRotation = randrp->rotation;
--- a/xorg-detect-psb.patch
+++ b/xorg-detect-psb.patch
@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86AutoConfig.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86AutoConfig.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/common/xf86AutoConfig.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86AutoConfig.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86AutoConfig.c
+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86AutoConfig.c
@@ -175,6 +175,9 @@ videoPtrToDriverList(struct pci_device *
 	case 0x8086:
 	    if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) {
--- a/xorg-server-1.6.3.901.tar.bz2
+++ b/xorg-server-1.6.3.901.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b8b9c40fc3da9268b03143cb4fc518baa9fcf88da73c7645c2d572bf23dbd50
+size 4678171
--- a/xorg-server-1.6.3.tar.bz2
+++ b/xorg-server-1.6.3.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7de60906f128b43730585ed760ece8979146dff841038ddc59bff4ad5d4ed308
-size 4651487
--- a/xorg-server-xf4vnc-TranslateNone.diff
+++ b/xorg-server-xf4vnc-TranslateNone.diff
@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/vnc/translate.c
+Index: xorg-server-1.6.3.901/hw/vnc/translate.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/vnc/translate.c
-+++ xorg-server-1.6.3/hw/vnc/translate.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/translate.c
+++ xorg-server-1.6.3.901/hw/vnc/translate.c
@@ -168,17 +168,17 @@ rfbTranslateNone(ScreenPtr pScreen, char
 {
     VNCSCREENPTR(pScreen);
--- a/xorg-server-xf4vnc-busyloop.diff
+++ b/xorg-server-xf4vnc-busyloop.diff
@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/vnc/sockets.c
+Index: xorg-server-1.6.3.901/hw/vnc/sockets.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/vnc/sockets.c
-+++ xorg-server-1.6.3/hw/vnc/sockets.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/sockets.c
+++ xorg-server-1.6.3.901/hw/vnc/sockets.c
@@ -448,7 +448,7 @@ WriteExact(sock, buf, len)
     int n;
     fd_set fds;
--- a/xorg-server-xf4vnc-clientTimeout.diff
+++ b/xorg-server-xf4vnc-clientTimeout.diff
@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/vnc/sockets.c
+Index: xorg-server-1.6.3.901/hw/vnc/sockets.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/vnc/sockets.c
-+++ xorg-server-1.6.3/hw/vnc/sockets.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/sockets.c
+++ xorg-server-1.6.3.901/hw/vnc/sockets.c
@@ -490,8 +490,10 @@ WriteExact(sock, buf, len)
 	    n = select(sock+1, NULL, &fds, NULL, &tv);
 #if 1
--- a/xorg-server-xf4vnc-fix.diff
+++ b/xorg-server-xf4vnc-fix.diff
@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/vnc/cursor.c
+Index: xorg-server-1.6.3.901/hw/vnc/cursor.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/vnc/cursor.c
-+++ xorg-server-1.6.3/hw/vnc/cursor.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/cursor.c
+++ xorg-server-1.6.3.901/hw/vnc/cursor.c
@@ -262,7 +262,7 @@ rfbSendCursorPos(cl, pScreen)
 
 #if XFREE86VNC
@ -11,10 +11,10 @@ Index: xorg-server-1.6.3/hw/vnc/cursor.c
 #else
     rfbSpriteGetCursorPos(pScreen, &x, &y);
 #endif
-Index: xorg-server-1.6.3/hw/vnc/cutpaste.c
+Index: xorg-server-1.6.3.901/hw/vnc/cutpaste.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/vnc/cutpaste.c
-+++ xorg-server-1.6.3/hw/vnc/cutpaste.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/cutpaste.c
+++ xorg-server-1.6.3.901/hw/vnc/cutpaste.c
@@ -66,7 +66,7 @@ rfbSetXCutText(char *str, int len)
 	    event.u.selectionClear.time = GetTimeInMillis();
 	    event.u.selectionClear.window = pSel->window;
@ -24,10 +24,10 @@ Index: xorg-server-1.6.3/hw/vnc/cutpaste.c
 				NoEventMask, NoEventMask /* CantBeFiltered */,
 				NullGrab);
 	}
-Index: xorg-server-1.6.3/hw/vnc/dispcur.c
+Index: xorg-server-1.6.3.901/hw/vnc/dispcur.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/vnc/dispcur.c
-+++ xorg-server-1.6.3/hw/vnc/dispcur.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/dispcur.c
+++ xorg-server-1.6.3.901/hw/vnc/dispcur.c
@@ -74,7 +74,10 @@ in this Software without prior written a
 
 /* per-screen private data */
@ -103,10 +103,10 @@ Index: xorg-server-1.6.3/hw/vnc/dispcur.c
     if (!pPriv)
     {
 	pPriv = rfbDCRealize(pScreen, pCursor);
-Index: xorg-server-1.6.3/hw/vnc/init.c
+Index: xorg-server-1.6.3.901/hw/vnc/init.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/vnc/init.c
-+++ xorg-server-1.6.3/hw/vnc/init.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/init.c
+++ xorg-server-1.6.3.901/hw/vnc/init.c
@@ -138,7 +138,7 @@ static void rfbCrossScreen(ScreenPtr pSc
 
 
@ -135,10 +135,10 @@ Index: xorg-server-1.6.3/hw/vnc/init.c
 				PtrDeviceControl,
                                 GetMaximumEventsNum(), 2 /* numAxes */);
         vncSetPointerDevice(pDevice);
-Index: xorg-server-1.6.3/hw/vnc/kbdptr.c
+Index: xorg-server-1.6.3.901/hw/vnc/kbdptr.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/vnc/kbdptr.c
-+++ xorg-server-1.6.3/hw/vnc/kbdptr.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/kbdptr.c
+++ xorg-server-1.6.3.901/hw/vnc/kbdptr.c
@@ -74,19 +74,26 @@ vncSetPointerDevice(DeviceIntPtr ptr)
 static void
 EnqueueMotion(DeviceIntPtr ptrDev, int x, int y)
@ -229,10 +229,10 @@ Index: xorg-server-1.6.3/hw/vnc/kbdptr.c
 
 	ErrorF("KbdAddEvent: unknown KeySym 0x%x - allocating KeyCode %d\n",
 	       (int)keySym, keyCode);
-Index: xorg-server-1.6.3/hw/vnc/rfbkeyb.c
+Index: xorg-server-1.6.3.901/hw/vnc/rfbkeyb.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/vnc/rfbkeyb.c
-+++ xorg-server-1.6.3/hw/vnc/rfbkeyb.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/rfbkeyb.c
+++ xorg-server-1.6.3.901/hw/vnc/rfbkeyb.c
@@ -388,7 +388,7 @@ static XF86ModuleVersionInfo xf86rfbKeyb
     "xf4vnc Project, see http://xf4vnc.sf.net",
     MODINFOSTRING1,
@ -242,10 +242,10 @@ Index: xorg-server-1.6.3/hw/vnc/rfbkeyb.c
     1, 0, 0,
     ABI_CLASS_XINPUT,
     ABI_XINPUT_VERSION,
-Index: xorg-server-1.6.3/hw/vnc/rfbmouse.c
+Index: xorg-server-1.6.3.901/hw/vnc/rfbmouse.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/vnc/rfbmouse.c
-+++ xorg-server-1.6.3/hw/vnc/rfbmouse.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/rfbmouse.c
+++ xorg-server-1.6.3.901/hw/vnc/rfbmouse.c
@@ -98,10 +98,12 @@ xf86rfbMouseControlProc(DeviceIntPtr dev
     void *func1;
     int (*func2)(void);
@ -278,10 +278,10 @@ Index: xorg-server-1.6.3/hw/vnc/rfbmouse.c
     1, 0, 0,
     ABI_CLASS_XINPUT,
     ABI_XINPUT_VERSION,
-Index: xorg-server-1.6.3/hw/vnc/rfbserver.c
+Index: xorg-server-1.6.3.901/hw/vnc/rfbserver.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/vnc/rfbserver.c
-+++ xorg-server-1.6.3/hw/vnc/rfbserver.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/rfbserver.c
+++ xorg-server-1.6.3.901/hw/vnc/rfbserver.c
@@ -1122,8 +1122,8 @@ rfbProcessClientNormalMessage(cl)
 
 	{
@ -293,10 +293,10 @@ Index: xorg-server-1.6.3/hw/vnc/rfbserver.c
 	}
 #endif
 
-Index: xorg-server-1.6.3/hw/vnc/sprite.c
+Index: xorg-server-1.6.3.901/hw/vnc/sprite.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/vnc/sprite.c
-+++ xorg-server-1.6.3/hw/vnc/sprite.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/sprite.c
+++ xorg-server-1.6.3.901/hw/vnc/sprite.c
@@ -112,7 +112,8 @@ static void	    rfbSpriteSaveDoomedAreas
 static RegionPtr    rfbSpriteRestoreAreas(WindowPtr pWin, RegionPtr pRgnExposed);
 static void	    rfbSpriteComputeSaved(ScreenPtr pScreen);
@ -424,10 +424,10 @@ Index: xorg-server-1.6.3/hw/vnc/sprite.c
 
     /* send new cursor shape to interested viewers */
     for (cl = rfbClientHead; cl ; cl = cl->next) {
-Index: xorg-server-1.6.3/hw/vnc/vncext.c
+Index: xorg-server-1.6.3.901/hw/vnc/vncext.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/vnc/vncext.c
-+++ xorg-server-1.6.3/hw/vnc/vncext.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/vncext.c
+++ xorg-server-1.6.3.901/hw/vnc/vncext.c
@@ -36,8 +36,9 @@
 #include <arpa/inet.h>
 #include <netdb.h>
@ -467,10 +467,10 @@ Index: xorg-server-1.6.3/hw/vnc/vncext.c
 				 NoEventMask, NullGrab);
 	}
 	pn = pn->next;
-Index: xorg-server-1.6.3/hw/xfree86/vnc/vncInit.c
+Index: xorg-server-1.6.3.901/hw/xfree86/vnc/vncInit.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/vnc/vncInit.c
-+++ xorg-server-1.6.3/hw/xfree86/vnc/vncInit.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/vnc/vncInit.c
+++ xorg-server-1.6.3.901/hw/xfree86/vnc/vncInit.c
@@ -35,7 +35,7 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
--- a/xorg-server-xf4vnc.patch
+++ b/xorg-server-xf4vnc.patch
@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/Makefile.am
+Index: xorg-server-1.6.3.901/Makefile.am
 ===================================================================
--- xorg-server-1.6.3.orig/Makefile.am
-+++ xorg-server-1.6.3/Makefile.am
+--- xorg-server-1.6.3.901.orig/Makefile.am
+++ xorg-server-1.6.3.901/Makefile.am
@@ -17,6 +17,10 @@ if RECORD
 RECORD_DIR=record
 endif
@ -21,10 +21,10 @@ Index: xorg-server-1.6.3/Makefile.am
 	exa \
 	config \
 	hw
-Index: xorg-server-1.6.3/configure.ac
+Index: xorg-server-1.6.3.901/configure.ac
 ===================================================================
--- xorg-server-1.6.3.orig/configure.ac
-+++ xorg-server-1.6.3/configure.ac
+--- xorg-server-1.6.3.901.orig/configure.ac
+++ xorg-server-1.6.3.901/configure.ac
@@ -553,6 +553,8 @@ AC_ARG_ENABLE(xfree86-utils,     AS_HELP
 
 dnl DDXes.
@ -123,10 +123,10 @@ Index: xorg-server-1.6.3/configure.ac
 hw/xnest/Makefile
 hw/xwin/Makefile
 hw/xquartz/Makefile
-Index: xorg-server-1.6.3/hw/Makefile.am
+Index: xorg-server-1.6.3.901/hw/Makefile.am
 ===================================================================
--- xorg-server-1.6.3.orig/hw/Makefile.am
-+++ xorg-server-1.6.3/hw/Makefile.am
+--- xorg-server-1.6.3.901.orig/hw/Makefile.am
+++ xorg-server-1.6.3.901/hw/Makefile.am
@@ -22,6 +22,10 @@ if KDRIVE
 KDRIVE_SUBDIRS = kdrive
 endif
@ -151,10 +151,10 @@ Index: xorg-server-1.6.3/hw/Makefile.am
 
 relink:
 	for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink ; done
-Index: xorg-server-1.6.3/hw/dmx/Makefile.am
+Index: xorg-server-1.6.3.901/hw/dmx/Makefile.am
 ===================================================================
--- xorg-server-1.6.3.orig/hw/dmx/Makefile.am
-+++ xorg-server-1.6.3/hw/dmx/Makefile.am
+--- xorg-server-1.6.3.901.orig/hw/dmx/Makefile.am
+++ xorg-server-1.6.3.901/hw/dmx/Makefile.am
@@ -1,6 +1,6 @@
 -DIST_SUBDIRS = input config glxProxy examples doc
 +DIST_SUBDIRS = input vnc config glxProxy examples doc
@ -164,10 +164,10 @@ Index: xorg-server-1.6.3/hw/dmx/Makefile.am
 bin_PROGRAMS = Xdmx
 
 if XINERAMA
-Index: xorg-server-1.6.3/hw/dmx/dmx-config.h
+Index: xorg-server-1.6.3.901/hw/dmx/dmx-config.h
 ===================================================================
--- xorg-server-1.6.3.orig/hw/dmx/dmx-config.h
-+++ xorg-server-1.6.3/hw/dmx/dmx-config.h
+--- xorg-server-1.6.3.901.orig/hw/dmx/dmx-config.h
+++ xorg-server-1.6.3.901/hw/dmx/dmx-config.h
@@ -72,6 +72,9 @@
 /* Enable the DMX extension */
 #define DMXEXT
@ -178,10 +178,10 @@ Index: xorg-server-1.6.3/hw/dmx/dmx-config.h
 /* Disable the extensions that are not currently supported */
 #undef MULTIBUFFER
 #undef XV
-Index: xorg-server-1.6.3/hw/dmx/dmxinit.c
+Index: xorg-server-1.6.3.901/hw/dmx/dmxinit.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/dmx/dmxinit.c
-+++ xorg-server-1.6.3/hw/dmx/dmxinit.c
+--- xorg-server-1.6.3.901.orig/hw/dmx/dmxinit.c
+++ xorg-server-1.6.3.901/hw/dmx/dmxinit.c
@@ -77,6 +77,10 @@ extern void GlxSetVisualConfigs(
 );
 #endif /* GLXEXT */
@ -218,10 +218,10 @@ Index: xorg-server-1.6.3/hw/dmx/dmxinit.c
 +    return tp.tv_sec * 1000 + tp.tv_usec / 1000;
 +}
 +#endif
-Index: xorg-server-1.6.3/hw/dmx/dmxsync.c
+Index: xorg-server-1.6.3.901/hw/dmx/dmxsync.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/dmx/dmxsync.c
-+++ xorg-server-1.6.3/hw/dmx/dmxsync.c
+--- xorg-server-1.6.3.901.orig/hw/dmx/dmxsync.c
+++ xorg-server-1.6.3.901/hw/dmx/dmxsync.c
@@ -99,9 +99,16 @@ static void dmxSyncBlockHandler(pointer
     TimerForce(dmxSyncTimer);
 }
@ -239,10 +239,10 @@ Index: xorg-server-1.6.3/hw/dmx/dmxsync.c
 }
 
 /** Request the XSync() batching optimization with the specified \a
-Index: xorg-server-1.6.3/hw/dmx/input/Makefile.am
+Index: xorg-server-1.6.3.901/hw/dmx/input/Makefile.am
 ===================================================================
--- xorg-server-1.6.3.orig/hw/dmx/input/Makefile.am
-+++ xorg-server-1.6.3/hw/dmx/input/Makefile.am
+--- xorg-server-1.6.3.901.orig/hw/dmx/input/Makefile.am
+++ xorg-server-1.6.3.901/hw/dmx/input/Makefile.am
@@ -65,6 +65,7 @@ AM_CFLAGS = $(DIX_CFLAGS) \
             -I$(top_srcdir)/hw/dmx \
             $(GLX_INCS) \
@ -251,10 +251,10 @@ Index: xorg-server-1.6.3/hw/dmx/input/Makefile.am
             $(GLX_DEFS) \
             @DMXMODULES_CFLAGS@
 
-Index: xorg-server-1.6.3/hw/dmx/input/dmxcommon.c
+Index: xorg-server-1.6.3.901/hw/dmx/input/dmxcommon.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/dmx/input/dmxcommon.c
-+++ xorg-server-1.6.3/hw/dmx/input/dmxcommon.c
+--- xorg-server-1.6.3.901.orig/hw/dmx/input/dmxcommon.c
+++ xorg-server-1.6.3.901/hw/dmx/input/dmxcommon.c
@@ -655,7 +655,6 @@ void dmxCommonRestoreState(pointer priva
             dmxLogInput(dmxInput, "Keyboard busy, waiting\n");
         else
@ -263,10 +263,10 @@ Index: xorg-server-1.6.3/hw/dmx/input/dmxcommon.c
                                 /* Don't generate X11 protocol for a bit */
         for (tmp = GetTimeInMillis(); GetTimeInMillis() - tmp < 250;) {
             usleep(250);            /* This ends up sleeping only until
-Index: xorg-server-1.6.3/hw/dmx/input/dmxinputinit.c
+Index: xorg-server-1.6.3.901/hw/dmx/input/dmxinputinit.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/dmx/input/dmxinputinit.c
-+++ xorg-server-1.6.3/hw/dmx/input/dmxinputinit.c
+--- xorg-server-1.6.3.901.orig/hw/dmx/input/dmxinputinit.c
+++ xorg-server-1.6.3.901/hw/dmx/input/dmxinputinit.c
@@ -391,6 +391,10 @@ static int dmxKeyboardOn(DeviceIntPtr pD
     DevicePtr pDev = &pDevice->public;
 #endif
@ -298,10 +298,10 @@ Index: xorg-server-1.6.3/hw/dmx/input/dmxinputinit.c
         }
         if (info.focusClass)       InitFocusClassDeviceStruct(pDevice);
         if (info.proximityClass)   InitProximityClassDeviceStruct(pDevice);
-Index: xorg-server-1.6.3/hw/dmx/input/dmxinputinit.h
+Index: xorg-server-1.6.3.901/hw/dmx/input/dmxinputinit.h
 ===================================================================
--- xorg-server-1.6.3.orig/hw/dmx/input/dmxinputinit.h
-+++ xorg-server-1.6.3/hw/dmx/input/dmxinputinit.h
+--- xorg-server-1.6.3.901.orig/hw/dmx/input/dmxinputinit.h
+++ xorg-server-1.6.3.901/hw/dmx/input/dmxinputinit.h
@@ -290,4 +290,9 @@ extern int          dmxInputAttachConsol
 extern int          dmxInputAttachBackend(int physicalScreen, int isCore,
                                           int *id);
@ -312,10 +312,10 @@ Index: xorg-server-1.6.3/hw/dmx/input/dmxinputinit.h
 +#endif
 +
 #endif
-Index: xorg-server-1.6.3/hw/dmx/vnc/.gitignore
+Index: xorg-server-1.6.3.901/hw/dmx/vnc/.gitignore
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/dmx/vnc/.gitignore
+++ xorg-server-1.6.3.901/hw/dmx/vnc/.gitignore
@@ -0,0 +1,36 @@
 +auth.c
 +cmap.c
@ -353,10 +353,10 @@ Index: xorg-server-1.6.3/hw/dmx/vnc/.gitignore
 +vncext.c
 +xistubs.c
 +zlib.c
-Index: xorg-server-1.6.3/hw/dmx/vnc/Makefile.am
+Index: xorg-server-1.6.3.901/hw/dmx/vnc/Makefile.am
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/dmx/vnc/Makefile.am
+++ xorg-server-1.6.3.901/hw/dmx/vnc/Makefile.am
@@ -0,0 +1,43 @@
 +noinst_LIBRARIES = libdmxvnc.a
 +
@ -401,10 +401,10 @@ Index: xorg-server-1.6.3/hw/dmx/vnc/Makefile.am
 +            @DMXMODULES_CFLAGS@
 +
 +###EXTRA_DIST = dmxdetach.c
-Index: xorg-server-1.6.3/hw/dmx/vnc/vncInit.c
+Index: xorg-server-1.6.3.901/hw/dmx/vnc/vncInit.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/dmx/vnc/vncInit.c
+++ xorg-server-1.6.3.901/hw/dmx/vnc/vncInit.c
@@ -0,0 +1,453 @@
 +/*
 + *  Copyright (C) 2002 Alan Hourihane.  All Rights Reserved.
@ -859,10 +859,10 @@ Index: xorg-server-1.6.3/hw/dmx/vnc/vncInit.c
 +    rfbCheckFds(pScreen);
 +    httpCheckFds(pScreen);
 +}
-Index: xorg-server-1.6.3/hw/dmx/vnc/vncint.h
+Index: xorg-server-1.6.3.901/hw/dmx/vnc/vncint.h
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/dmx/vnc/vncint.h
+++ xorg-server-1.6.3.901/hw/dmx/vnc/vncint.h
@@ -0,0 +1,153 @@
 +/*
 + *  Copyright (C) 2002 Alan Hourihane.  All Rights Reserved.
@ -1017,10 +1017,10 @@ Index: xorg-server-1.6.3/hw/dmx/vnc/vncint.h
 +
 +#endif /* _VNCINT_H_ */
 +
-Index: xorg-server-1.6.3/hw/vnc/LICENCE.TXT
+Index: xorg-server-1.6.3.901/hw/vnc/LICENCE.TXT
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/LICENCE.TXT
+++ xorg-server-1.6.3.901/hw/vnc/LICENCE.TXT
@@ -0,0 +1,340 @@
 +		    GNU GENERAL PUBLIC LICENSE
 +		       Version 2, June 1991
@ -1362,10 +1362,10 @@ Index: xorg-server-1.6.3/hw/vnc/LICENCE.TXT
 +consider it more useful to permit linking proprietary applications with the
 +library.  If this is what you want to do, use the GNU Library General
 +Public License instead of this License.
-Index: xorg-server-1.6.3/hw/vnc/Makefile.am
+Index: xorg-server-1.6.3.901/hw/vnc/Makefile.am
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/Makefile.am
+++ xorg-server-1.6.3.901/hw/vnc/Makefile.am
@@ -0,0 +1,54 @@
 +# XXX This Makefile.am probably needs some work.
 +
@ -1421,10 +1421,10 @@ Index: xorg-server-1.6.3/hw/vnc/Makefile.am
 +
 +relink:
 +	rm -f Xvnc && $(MAKE) Xvnc
-Index: xorg-server-1.6.3/hw/vnc/README
+Index: xorg-server-1.6.3.901/hw/vnc/README
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/README
+++ xorg-server-1.6.3.901/hw/vnc/README
@@ -0,0 +1,14 @@
 +
 +This is the directory containing the code specific to the TightVNC X server (Xvnc).
@ -1440,10 +1440,10 @@ Index: xorg-server-1.6.3/hw/vnc/README
 +
 +Moved to X.org modular tree by Brian Paul.
 +
-Index: xorg-server-1.6.3/hw/vnc/auth.c
+Index: xorg-server-1.6.3.901/hw/vnc/auth.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/auth.c
+++ xorg-server-1.6.3.901/hw/vnc/auth.c
@@ -0,0 +1,566 @@
 +/*
 + * auth.c - deal with authentication.
@ -2011,10 +2011,10 @@ Index: xorg-server-1.6.3/hw/vnc/auth.c
 +    return pVNC->rfbAuthTooManyTries;
 +}
 +
-Index: xorg-server-1.6.3/hw/vnc/cmap.c
+Index: xorg-server-1.6.3.901/hw/vnc/cmap.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/cmap.c
+++ xorg-server-1.6.3.901/hw/vnc/cmap.c
@@ -0,0 +1,166 @@
 +/*
 + * cmap.c
@ -2182,10 +2182,10 @@ Index: xorg-server-1.6.3/hw/vnc/cmap.c
 +    pmap->pScreen->StoreColors = rfbStoreColors;
 +#endif
 +}
-Index: xorg-server-1.6.3/hw/vnc/corre.c
+Index: xorg-server-1.6.3.901/hw/vnc/corre.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/corre.c
+++ xorg-server-1.6.3.901/hw/vnc/corre.c
@@ -0,0 +1,353 @@
 +/*
 + * corre.c
@ -2540,10 +2540,10 @@ Index: xorg-server-1.6.3/hw/vnc/corre.c
 +  
 +  return maxclr;
 +}
-Index: xorg-server-1.6.3/hw/vnc/cursor.c
+Index: xorg-server-1.6.3.901/hw/vnc/cursor.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/cursor.c
+++ xorg-server-1.6.3.901/hw/vnc/cursor.c
@@ -0,0 +1,407 @@
 +/*
 + * cursor.c - support for cursor shape updates.
@ -2952,10 +2952,10 @@ Index: xorg-server-1.6.3/hw/vnc/cursor.c
 +DEFINE_RICH_ENCODE(16)
 +DEFINE_RICH_ENCODE(32)
 +
-Index: xorg-server-1.6.3/hw/vnc/cutpaste.c
+Index: xorg-server-1.6.3.901/hw/vnc/cutpaste.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/cutpaste.c
+++ xorg-server-1.6.3.901/hw/vnc/cutpaste.c
@@ -0,0 +1,87 @@
 +/*
 + * cutpaste.c - routines to deal with cut & paste buffers / selection.
@ -3044,10 +3044,10 @@ Index: xorg-server-1.6.3/hw/vnc/cutpaste.c
 +    if (!inSetXCutText)
 +	rfbSendServerCutText(str, len);
 +}
-Index: xorg-server-1.6.3/hw/vnc/d3des.c
+Index: xorg-server-1.6.3.901/hw/vnc/d3des.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/d3des.c
+++ xorg-server-1.6.3.901/hw/vnc/d3des.c
@@ -0,0 +1,437 @@
 +/*
 + * This is D3DES (V5.09) by Richard Outerbridge with the double and
@ -3486,10 +3486,10 @@ Index: xorg-server-1.6.3/hw/vnc/d3des.c
 + *
 + * d3des V5.0a rwo 9208.07 18:44 Graven Imagery
 + **********************************************************************/
-Index: xorg-server-1.6.3/hw/vnc/d3des.h
+Index: xorg-server-1.6.3.901/hw/vnc/d3des.h
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/d3des.h
+++ xorg-server-1.6.3.901/hw/vnc/d3des.h
@@ -0,0 +1,51 @@
 +/*
 + * This is D3DES (V5.09) by Richard Outerbridge with the double and
@ -3542,10 +3542,10 @@ Index: xorg-server-1.6.3/hw/vnc/d3des.h
 +
 +/* d3des.h V5.09 rwo 9208.04 15:06 Graven Imagery
 + ********************************************************************/
-Index: xorg-server-1.6.3/hw/vnc/dispcur.c
+Index: xorg-server-1.6.3.901/hw/vnc/dispcur.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/dispcur.c
+++ xorg-server-1.6.3.901/hw/vnc/dispcur.c
@@ -0,0 +1,792 @@
 +/*
 + * dispcur.c
@ -4339,10 +4339,10 @@ Index: xorg-server-1.6.3/hw/vnc/dispcur.c
 +			    0, 0, w, h, x, y);
 +    return TRUE;
 +}
-Index: xorg-server-1.6.3/hw/vnc/dpmsstubs.c
+Index: xorg-server-1.6.3.901/hw/vnc/dpmsstubs.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/dpmsstubs.c
+++ xorg-server-1.6.3.901/hw/vnc/dpmsstubs.c
@@ -0,0 +1,52 @@
 +/* $Xorg: dpmsstubs.c,v 1.3 2000/08/17 19:47:56 cpqbld Exp $ */
 +/*****************************************************************
@ -4396,10 +4396,10 @@ Index: xorg-server-1.6.3/hw/vnc/dpmsstubs.c
 +{
 +
 +}
-Index: xorg-server-1.6.3/hw/vnc/draw.c
+Index: xorg-server-1.6.3.901/hw/vnc/draw.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/draw.c
+++ xorg-server-1.6.3.901/hw/vnc/draw.c
@@ -0,0 +1,2021 @@
 +/*
 + * draw.c - drawing routines for the RFB X server.  This is a set of
@ -6422,10 +6422,10 @@ Index: xorg-server-1.6.3/hw/vnc/draw.c
 +    VNCSCREENPTR(pScreen);
 +    SCHEDULE_FB_UPDATE(pScreen, pVNC);
 +}
-Index: xorg-server-1.6.3/hw/vnc/hextile.c
+Index: xorg-server-1.6.3.901/hw/vnc/hextile.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/hextile.c
+++ xorg-server-1.6.3.901/hw/vnc/hextile.c
@@ -0,0 +1,350 @@
 +/*
 + * hextile.c
@ -6777,10 +6777,10 @@ Index: xorg-server-1.6.3/hw/vnc/hextile.c
 +DEFINE_SEND_HEXTILES(8)
 +DEFINE_SEND_HEXTILES(16)
 +DEFINE_SEND_HEXTILES(32)
-Index: xorg-server-1.6.3/hw/vnc/httpd.c
+Index: xorg-server-1.6.3.901/hw/vnc/httpd.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/httpd.c
+++ xorg-server-1.6.3.901/hw/vnc/httpd.c
@@ -0,0 +1,519 @@
 +/*
 + * httpd.c - a simple HTTP server
@ -7301,10 +7301,10 @@ Index: xorg-server-1.6.3/hw/vnc/httpd.c
 +    return TRUE;
 +}
 +
-Index: xorg-server-1.6.3/hw/vnc/init.c
+Index: xorg-server-1.6.3.901/hw/vnc/init.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/init.c
+++ xorg-server-1.6.3.901/hw/vnc/init.c
@@ -0,0 +1,1078 @@
 +/*
 + * init.c
@ -8384,10 +8384,10 @@ Index: xorg-server-1.6.3/hw/vnc/init.c
 +    rfbLog("");
 +    perror(str);
 +}
-Index: xorg-server-1.6.3/hw/vnc/kbdptr.c
+Index: xorg-server-1.6.3.901/hw/vnc/kbdptr.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/kbdptr.c
+++ xorg-server-1.6.3.901/hw/vnc/kbdptr.c
@@ -0,0 +1,458 @@
 +/*
 + * kbdptr.c - deal with keyboard and pointer device over TCP & UDP.
@ -8847,10 +8847,10 @@ Index: xorg-server-1.6.3/hw/vnc/kbdptr.c
 +        break;
 +    }
 +}
-Index: xorg-server-1.6.3/hw/vnc/keyboard.h
+Index: xorg-server-1.6.3.901/hw/vnc/keyboard.h
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/keyboard.h
+++ xorg-server-1.6.3.901/hw/vnc/keyboard.h
@@ -0,0 +1,167 @@
 +/*
 + *  Copyright (C) 2002 Alan Hourihane.  All Rights Reserved.
@ -9019,10 +9019,10 @@ Index: xorg-server-1.6.3/hw/vnc/keyboard.h
 +};
 +
 +#define N_PREDEFINED_KEYS (sizeof(map) / (sizeof(KeySym) * GLYPHS_PER_KEY))
-Index: xorg-server-1.6.3/hw/vnc/loginauth.c
+Index: xorg-server-1.6.3.901/hw/vnc/loginauth.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/loginauth.c
+++ xorg-server-1.6.3.901/hw/vnc/loginauth.c
@@ -0,0 +1,143 @@
 +/*
 + * loginauth.c - deal with login-style Unix authentication.
@ -9167,10 +9167,10 @@ Index: xorg-server-1.6.3/hw/vnc/loginauth.c
 +    cl->state = RFB_INITIALISATION;
 +}
 +
-Index: xorg-server-1.6.3/hw/vnc/rdp.c
+Index: xorg-server-1.6.3.901/hw/vnc/rdp.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/rdp.c
+++ xorg-server-1.6.3.901/hw/vnc/rdp.c
@@ -0,0 +1,147 @@
 +/*
 + *  Copyright (C) 2004 Alan Hourihane.  All Rights Reserved.
@ -9319,10 +9319,10 @@ Index: xorg-server-1.6.3/hw/vnc/rdp.c
 +	rdpNewClient(pScreen, sock);
 +    }
 +}
-Index: xorg-server-1.6.3/hw/vnc/rfb.h
+Index: xorg-server-1.6.3.901/hw/vnc/rfb.h
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/rfb.h
+++ xorg-server-1.6.3.901/hw/vnc/rfb.h
@@ -0,0 +1,751 @@
 +/*
 + * rfb.h - header file for RFB DDX implementation.
@ -10075,10 +10075,10 @@ Index: xorg-server-1.6.3/hw/vnc/rfb.h
 +
 +
 +#endif /* RFB_H_INCLUDED */
-Index: xorg-server-1.6.3/hw/vnc/rfbkeyb.c
+Index: xorg-server-1.6.3.901/hw/vnc/rfbkeyb.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/rfbkeyb.c
+++ xorg-server-1.6.3.901/hw/vnc/rfbkeyb.c
@@ -0,0 +1,405 @@
 +/*
 + *  Copyright (C) 2002 Alan Hourihane.  All Rights Reserved.
@ -10485,10 +10485,10 @@ Index: xorg-server-1.6.3/hw/vnc/rfbkeyb.c
 +
 +#endif /* XFree86LOADER */
 +#endif
-Index: xorg-server-1.6.3/hw/vnc/rfbmouse.c
+Index: xorg-server-1.6.3.901/hw/vnc/rfbmouse.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/rfbmouse.c
+++ xorg-server-1.6.3.901/hw/vnc/rfbmouse.c
@@ -0,0 +1,260 @@
 +/*
 + *  Copyright (C) 2002 Alan Hourihane.  All Rights Reserved.
@ -10750,10 +10750,10 @@ Index: xorg-server-1.6.3/hw/vnc/rfbmouse.c
 +
 +#endif /* XFree86LOADER */
 +#endif
-Index: xorg-server-1.6.3/hw/vnc/rfbproto.h
+Index: xorg-server-1.6.3.901/hw/vnc/rfbproto.h
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/rfbproto.h
+++ xorg-server-1.6.3.901/hw/vnc/rfbproto.h
@@ -0,0 +1,1362 @@
 +/*
 + *  Copyright (C) 2000-2004 Constantin Kaplinsky. All Rights Reserved.
@ -12117,10 +12117,10 @@ Index: xorg-server-1.6.3/hw/vnc/rfbproto.h
 +    rfbChromiumStopMsg csd;
 +    rfbChromiumExposeMsg cse;
 +} rfbClientToServerMsg;
-Index: xorg-server-1.6.3/hw/vnc/rfbserver.c
+Index: xorg-server-1.6.3.901/hw/vnc/rfbserver.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/rfbserver.c
+++ xorg-server-1.6.3.901/hw/vnc/rfbserver.c
@@ -0,0 +1,2308 @@
 +/*
 + * rfbserver.c - deal with server-side of the RFB protocol.
@ -14430,10 +14430,10 @@ Index: xorg-server-1.6.3/hw/vnc/rfbserver.c
 +	rfbDisconnectUDPSock(pScreen);
 +    }
 +}
-Index: xorg-server-1.6.3/hw/vnc/rre.c
+Index: xorg-server-1.6.3.901/hw/vnc/rre.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/rre.c
+++ xorg-server-1.6.3.901/hw/vnc/rre.c
@@ -0,0 +1,324 @@
 +/*
 + * rre.c
@ -14759,10 +14759,10 @@ Index: xorg-server-1.6.3/hw/vnc/rre.c
 +  
 +  return maxclr;
 +}
-Index: xorg-server-1.6.3/hw/vnc/sockets.c
+Index: xorg-server-1.6.3.901/hw/vnc/sockets.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/sockets.c
+++ xorg-server-1.6.3.901/hw/vnc/sockets.c
@@ -0,0 +1,656 @@
 +/*
 + * sockets.c - deal with TCP & UDP sockets.
@ -15420,10 +15420,10 @@ Index: xorg-server-1.6.3/hw/vnc/sockets.c
 +    return TRUE;
 +}
 +#endif
-Index: xorg-server-1.6.3/hw/vnc/sprite.c
+Index: xorg-server-1.6.3.901/hw/vnc/sprite.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/sprite.c
+++ xorg-server-1.6.3.901/hw/vnc/sprite.c
@@ -0,0 +1,2279 @@
 +/*
 + * sprite.c
@ -17704,10 +17704,10 @@ Index: xorg-server-1.6.3/hw/vnc/sprite.c
 +    *py = pScreenPriv->y;
 +}
 +
-Index: xorg-server-1.6.3/hw/vnc/sprite.h
+Index: xorg-server-1.6.3.901/hw/vnc/sprite.h
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/sprite.h
+++ xorg-server-1.6.3.901/hw/vnc/sprite.h
@@ -0,0 +1,141 @@
 +/*
 + * sprite.h
@ -17850,10 +17850,10 @@ Index: xorg-server-1.6.3/hw/vnc/sprite.h
 +    int *       /*py*/
 +#endif
 +);
-Index: xorg-server-1.6.3/hw/vnc/spritest.h
+Index: xorg-server-1.6.3.901/hw/vnc/spritest.h
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/spritest.h
+++ xorg-server-1.6.3.901/hw/vnc/spritest.h
@@ -0,0 +1,138 @@
 +/*
 + * spritest.h
@ -17993,10 +17993,10 @@ Index: xorg-server-1.6.3/hw/vnc/spritest.h
 +
 +#define LINE_OVERLAP(pCbox,x1,y1,x2,y2,lw2) \
 +    BOX_OVERLAP((pCbox), (x1)-(lw2), (y1)-(lw2), (x2)+(lw2), (y2)+(lw2))
-Index: xorg-server-1.6.3/hw/vnc/stats.c
+Index: xorg-server-1.6.3.901/hw/vnc/stats.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/stats.c
+++ xorg-server-1.6.3.901/hw/vnc/stats.c
@@ -0,0 +1,117 @@
 +/*
 + * stats.c
@ -18115,10 +18115,10 @@ Index: xorg-server-1.6.3/hw/vnc/stats.c
 +			   cl->rfbLastRectBytesSent));
 +    }
 +}
-Index: xorg-server-1.6.3/hw/vnc/symlink-vnc.sh
+Index: xorg-server-1.6.3.901/hw/vnc/symlink-vnc.sh
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/symlink-vnc.sh
+++ xorg-server-1.6.3.901/hw/vnc/symlink-vnc.sh
@@ -0,0 +1,198 @@
 +#!/bin/sh
 +
@ -18318,10 +18318,10 @@ Index: xorg-server-1.6.3/hw/vnc/symlink-vnc.sh
 +}
 +
 +main $1 $2
-Index: xorg-server-1.6.3/hw/vnc/tableinitcmtemplate.c
+Index: xorg-server-1.6.3.901/hw/vnc/tableinitcmtemplate.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/tableinitcmtemplate.c
+++ xorg-server-1.6.3.901/hw/vnc/tableinitcmtemplate.c
@@ -0,0 +1,93 @@
 +/*
 + * tableinitcmtemplate.c - template for initialising lookup tables for
@ -18416,10 +18416,10 @@ Index: xorg-server-1.6.3/hw/vnc/tableinitcmtemplate.c
 +#undef OUT_T
 +#undef SwapOUT
 +#undef rfbInitColourMapSingleTableOUT
-Index: xorg-server-1.6.3/hw/vnc/tableinittctemplate.c
+Index: xorg-server-1.6.3.901/hw/vnc/tableinittctemplate.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/tableinittctemplate.c
+++ xorg-server-1.6.3.901/hw/vnc/tableinittctemplate.c
@@ -0,0 +1,146 @@
 +/*
 + * tableinittctemplate.c - template for initialising lookup tables for
@ -18567,10 +18567,10 @@ Index: xorg-server-1.6.3/hw/vnc/tableinittctemplate.c
 +#undef rfbInitTrueColourSingleTableOUT
 +#undef rfbInitTrueColourRGBTablesOUT
 +#undef rfbInitOneRGBTableOUT
-Index: xorg-server-1.6.3/hw/vnc/tabletranstemplate.c
+Index: xorg-server-1.6.3.901/hw/vnc/tabletranstemplate.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/tabletranstemplate.c
+++ xorg-server-1.6.3.901/hw/vnc/tabletranstemplate.c
@@ -0,0 +1,135 @@
 +/*
 + * tabletranstemplate.c - template for translation using lookup tables.
@ -18707,10 +18707,10 @@ Index: xorg-server-1.6.3/hw/vnc/tabletranstemplate.c
 +#undef OUT_T
 +#undef rfbTranslateWithSingleTableINtoOUT
 +#undef rfbTranslateWithRGBTablesINtoOUT
-Index: xorg-server-1.6.3/hw/vnc/tight.c
+Index: xorg-server-1.6.3.901/hw/vnc/tight.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/tight.c
+++ xorg-server-1.6.3.901/hw/vnc/tight.c
@@ -0,0 +1,1827 @@
 +/*
 + * tight.c
@ -20539,10 +20539,10 @@ Index: xorg-server-1.6.3/hw/vnc/tight.c
 +    cinfo->dest = &jpegDstManager;
 +}
 +
-Index: xorg-server-1.6.3/hw/vnc/translate.c
+Index: xorg-server-1.6.3.901/hw/vnc/translate.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/translate.c
+++ xorg-server-1.6.3.901/hw/vnc/translate.c
@@ -0,0 +1,502 @@
 +/*
 + * translate.c - translate between different pixel formats
@ -21046,10 +21046,10 @@ Index: xorg-server-1.6.3/hw/vnc/translate.c
 +	}
 +    }
 +}
-Index: xorg-server-1.6.3/hw/vnc/vncauth.c
+Index: xorg-server-1.6.3.901/hw/vnc/vncauth.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/vncauth.c
+++ xorg-server-1.6.3.901/hw/vnc/vncauth.c
@@ -0,0 +1,252 @@
 +/*
 + *  Copyright (C) 1999 AT&T Laboratories Cambridge.  All Rights Reserved.
@ -21303,10 +21303,10 @@ Index: xorg-server-1.6.3/hw/vnc/vncauth.c
 +	des(bytes+i, bytes+i);
 +    }
 +}
-Index: xorg-server-1.6.3/hw/vnc/vncauth.h
+Index: xorg-server-1.6.3.901/hw/vnc/vncauth.h
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/vncauth.h
+++ xorg-server-1.6.3.901/hw/vnc/vncauth.h
@@ -0,0 +1,33 @@
 +/*
 + *  Copyright (C) 1999 AT&T Laboratories Cambridge.  All Rights Reserved.
@ -21341,10 +21341,10 @@ Index: xorg-server-1.6.3/hw/vnc/vncauth.h
 +extern int vncEncryptAndStorePasswd2(char *passwd, char *passwdViewOnly, char *fname);
 +extern int vncDecryptPasswdFromFile2(char *fname, char *passwdFullControl, char *passwdViewOnly);
 +
-Index: xorg-server-1.6.3/hw/vnc/vncext.c
+Index: xorg-server-1.6.3.901/hw/vnc/vncext.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/vncext.c
+++ xorg-server-1.6.3.901/hw/vnc/vncext.c
@@ -0,0 +1,800 @@
 +/*
 + *  Copyright (C) 2002 Alan Hourihane.  All Rights Reserved.
@ -22146,10 +22146,10 @@ Index: xorg-server-1.6.3/hw/vnc/vncext.c
 +	(EventSwapPtr)SwapVncChromiumConnectedEvent;
 +#endif
 +} /* VncExtensionInit */
-Index: xorg-server-1.6.3/hw/vnc/xistubs.c
+Index: xorg-server-1.6.3.901/hw/vnc/xistubs.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/xistubs.c
+++ xorg-server-1.6.3.901/hw/vnc/xistubs.c
@@ -0,0 +1,323 @@
 +/* $Xorg: stubs.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */
 +
@ -22474,10 +22474,10 @@ Index: xorg-server-1.6.3/hw/vnc/xistubs.c
 +	    return (BadMatch);
 +	}
 +    }
-Index: xorg-server-1.6.3/hw/vnc/zlib.c
+Index: xorg-server-1.6.3.901/hw/vnc/zlib.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/vnc/zlib.c
+++ xorg-server-1.6.3.901/hw/vnc/zlib.c
@@ -0,0 +1,310 @@
 +/*
 + * zlib.c
@ -22789,10 +22789,10 @@ Index: xorg-server-1.6.3/hw/vnc/zlib.c
 +}
 +
 +
-Index: xorg-server-1.6.3/hw/xfree86/Makefile.am
+Index: xorg-server-1.6.3.901/hw/xfree86/Makefile.am
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/Makefile.am
-+++ xorg-server-1.6.3/hw/xfree86/Makefile.am
+--- xorg-server-1.6.3.901.orig/hw/xfree86/Makefile.am
+++ xorg-server-1.6.3.901/hw/xfree86/Makefile.am
@@ -4,6 +4,10 @@ if DRI
 DRI_SUBDIR = dri
 endif
@ -22820,10 +22820,10 @@ Index: xorg-server-1.6.3/hw/xfree86/Makefile.am
 
 bin_PROGRAMS = Xorg
 
-Index: xorg-server-1.6.3/hw/xfree86/dixmods/Makefile.am
+Index: xorg-server-1.6.3.901/hw/xfree86/dixmods/Makefile.am
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/dixmods/Makefile.am
-+++ xorg-server-1.6.3/hw/xfree86/dixmods/Makefile.am
+--- xorg-server-1.6.3.901.orig/hw/xfree86/dixmods/Makefile.am
+++ xorg-server-1.6.3.901/hw/xfree86/dixmods/Makefile.am
@@ -10,6 +10,10 @@ if DBE
 DBEMOD = libdbe.la
 endif
@ -22860,10 +22860,10 @@ Index: xorg-server-1.6.3/hw/xfree86/dixmods/Makefile.am
 libfb_la_LDFLAGS = -avoid-version
 libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
 libfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
-Index: xorg-server-1.6.3/hw/xfree86/vnc/.gitignore
+Index: xorg-server-1.6.3.901/hw/xfree86/vnc/.gitignore
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/xfree86/vnc/.gitignore
+++ xorg-server-1.6.3.901/hw/xfree86/vnc/.gitignore
@@ -0,0 +1,36 @@
 +auth.c
 +cmap.c
@ -22901,10 +22901,10 @@ Index: xorg-server-1.6.3/hw/xfree86/vnc/.gitignore
 +vncext.c
 +xistubs.c
 +zlib.c
-Index: xorg-server-1.6.3/hw/xfree86/vnc/Makefile.am
+Index: xorg-server-1.6.3.901/hw/xfree86/vnc/Makefile.am
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/xfree86/vnc/Makefile.am
+++ xorg-server-1.6.3.901/hw/xfree86/vnc/Makefile.am
@@ -0,0 +1,51 @@
 +AM_CFLAGS = $(DIX_CFLAGS)
 +
@ -22957,16 +22957,16 @@ Index: xorg-server-1.6.3/hw/xfree86/vnc/Makefile.am
 +	zlib.c
 +
 +#sdk_HEADERS = vncint.h
-Index: xorg-server-1.6.3/hw/xfree86/vnc/README
+Index: xorg-server-1.6.3.901/hw/xfree86/vnc/README
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/xfree86/vnc/README
+++ xorg-server-1.6.3.901/hw/xfree86/vnc/README
@@ -0,0 +1 @@
 +This directory contains the sources for building the vnc.so server extension module.
-Index: xorg-server-1.6.3/hw/xfree86/vnc/vncInit.c
+Index: xorg-server-1.6.3.901/hw/xfree86/vnc/vncInit.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/xfree86/vnc/vncInit.c
+++ xorg-server-1.6.3.901/hw/xfree86/vnc/vncInit.c
@@ -0,0 +1,618 @@
 +/*
 + *  Copyright (C) 2002 Alan Hourihane.  All Rights Reserved.
@ -23586,10 +23586,10 @@ Index: xorg-server-1.6.3/hw/xfree86/vnc/vncInit.c
 +    return (pointer)TRUE;
 +}
 +#endif
-Index: xorg-server-1.6.3/hw/xfree86/vnc/vncint.h
+Index: xorg-server-1.6.3.901/hw/xfree86/vnc/vncint.h
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/hw/xfree86/vnc/vncint.h
+++ xorg-server-1.6.3.901/hw/xfree86/vnc/vncint.h
@@ -0,0 +1,151 @@
 +/*
 + *  Copyright (C) 2002 Alan Hourihane.  All Rights Reserved.
@ -23742,10 +23742,10 @@ Index: xorg-server-1.6.3/hw/xfree86/vnc/vncint.h
 +
 +#endif /* _VNC_H_ */
 +
-Index: xorg-server-1.6.3/mi/miinitext.c
+Index: xorg-server-1.6.3.901/mi/miinitext.c
 ===================================================================
--- xorg-server-1.6.3.orig/mi/miinitext.c
-+++ xorg-server-1.6.3/mi/miinitext.c
+--- xorg-server-1.6.3.901.orig/mi/miinitext.c
+++ xorg-server-1.6.3.901/mi/miinitext.c
@@ -78,6 +78,18 @@ SOFTWARE.
 #undef XF86VIDMODE
 #endif
@ -23765,10 +23765,10 @@ Index: xorg-server-1.6.3/mi/miinitext.c
 #include "misc.h"
 #include "extension.h"
 #include "micmap.h"
-Index: xorg-server-1.6.3/xcliplist/Makefile.am
+Index: xorg-server-1.6.3.901/xcliplist/Makefile.am
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/xcliplist/Makefile.am
+++ xorg-server-1.6.3.901/xcliplist/Makefile.am
@@ -0,0 +1,18 @@
 +#noinst_LTLIBRARIES = libxcliplist.la
 +libxcliplist_la_LTLIBRARIES = libxcliplist.la
@ -23788,10 +23788,10 @@ Index: xorg-server-1.6.3/xcliplist/Makefile.am
 +if XORG
 +sdk_HEADERS =
 +endif
-Index: xorg-server-1.6.3/xcliplist/cliplist.c
+Index: xorg-server-1.6.3.901/xcliplist/cliplist.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/xcliplist/cliplist.c
+++ xorg-server-1.6.3.901/xcliplist/cliplist.c
@@ -0,0 +1,128 @@
 +/*
 + * Server-side code for the Xcliplist extension
@ -23921,10 +23921,10 @@ Index: xorg-server-1.6.3/xcliplist/cliplist.c
 +      XClipListErrorBase = extEntry->errorBase;
 +   }
 +}
-Index: xorg-server-1.6.3/xcliplist/cliplistmod.c
+Index: xorg-server-1.6.3.901/xcliplist/cliplistmod.c
 ===================================================================
 --- /dev/null
-+++ xorg-server-1.6.3/xcliplist/cliplistmod.c
+++ xorg-server-1.6.3.901/xcliplist/cliplistmod.c
@@ -0,0 +1,46 @@
 +
 +#include "../hw/xfree86/common/xf86Module.h"
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 27 18:26:05 CEST 2009 - eich@suse.de
+
+- Update to 1.6.4 RC1, adapted patches.
+
 -------------------------------------------------------------------
 Fri Aug 14 02:33:19 CEST 2009 - sndirsch@suse.de

--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@ -20,7 +20,7 @@
 %define moblin 0

 Name:           xorg-x11-server
-%define dirsuffix 1.6.3
+%define dirsuffix 1.6.3.901
 %define fglrx_driver_hack 0
 ### FIXME
 %define vnc 1
@ -33,7 +33,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.4
-Release:        50
+Release:        51
 License:        GPL v2 or later ; MIT License (or similar)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@ -117,7 +117,6 @@ Patch144:       keyrelease-1.5.2.diff
 Patch145:       driver-autoconfig.diff
 Patch147:       truetype_fontpath.diff
 Patch148:       commit-c941479.diff
-Patch149:       0001-config-don-t-shutdown-the-libhal-ctx-if-it-failed-to.patch
 # Moblin
 Patch161:       libdri_noPanoramiXExtension_symbol.patch
 Patch162:       cache-xkbcomp-output-for-fast-start-up.patch
@ -260,7 +259,6 @@ popd
 %patch147 -p0
 ### Bug #528397
 #%patch148 -p1 -R
-%patch149 -p1
 %patch161 -p1
 %patch162 -p1
 %if %moblin
--- a/zap_warning_xserver.diff
+++ b/zap_warning_xserver.diff
@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86Config.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Config.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86Config.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Config.c
+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c
@@ -706,6 +706,7 @@ typedef enum {
     FLAG_NOTRAPSIGNALS,
     FLAG_DONTVTSWITCH,
@ -27,10 +27,10 @@ Index: xorg-server-1.6.3/hw/xfree86/common/xf86Config.c
     xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
 
     xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86Events.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Events.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Events.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86Events.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Events.c
+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Events.c
@@ -191,12 +191,26 @@ xf86ProcessActionEvent(ActionEvent actio
 #endif
     switch (action) {
@ -62,10 +62,10 @@ Index: xorg-server-1.6.3/hw/xfree86/common/xf86Events.c
 	break;
     case ACTION_NEXT_MODE:
 	if (!xf86Info.dontZoom)
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86Globals.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Globals.c
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Globals.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86Globals.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Globals.c
+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Globals.c
@@ -106,6 +106,7 @@ xf86InfoRec xf86Info = {
     .vtRequestsPending          = FALSE,
     .dontVTSwitch               = FALSE,
@ -74,10 +74,10 @@ Index: xorg-server-1.6.3/hw/xfree86/common/xf86Globals.c
     .dontZoom                   = FALSE,
     .notrapSignals              = FALSE,
     .caughtSignal               = FALSE,
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86Privstr.h
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Privstr.h
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Privstr.h
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86Privstr.h
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Privstr.h
+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Privstr.h
@@ -72,6 +72,7 @@ typedef struct {
     Bool		vtRequestsPending;
     Bool		dontVTSwitch;
@ -86,10 +86,10 @@ Index: xorg-server-1.6.3/hw/xfree86/common/xf86Privstr.h
     Bool		dontZoom;
     Bool		notrapSignals;	/* don't exit cleanly - die at fault */
     Bool		caughtSignal;
-Index: xorg-server-1.6.3/hw/xfree86/doc/man/Xorg.man.pre
+Index: xorg-server-1.6.3.901/hw/xfree86/doc/man/Xorg.man.pre
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/doc/man/Xorg.man.pre
-+++ xorg-server-1.6.3/hw/xfree86/doc/man/Xorg.man.pre
+--- xorg-server-1.6.3.901.orig/hw/xfree86/doc/man/Xorg.man.pre
+++ xorg-server-1.6.3.901/hw/xfree86/doc/man/Xorg.man.pre
@@ -452,8 +452,8 @@ are:
 Immediately kills the server -- no questions asked.  This is disabled by
 default.  It can be enabled with the -retro command line flag or by setting
@ -101,10 +101,10 @@ Index: xorg-server-1.6.3/hw/xfree86/doc/man/Xorg.man.pre
 .TP 8
 .B Ctrl+Alt+Keypad-Plus
 Change video mode to next one specified in the configuration file.
-Index: xorg-server-1.6.3/hw/xfree86/doc/man/xorg.conf.man.pre
+Index: xorg-server-1.6.3.901/hw/xfree86/doc/man/xorg.conf.man.pre
 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/doc/man/xorg.conf.man.pre
-+++ xorg-server-1.6.3/hw/xfree86/doc/man/xorg.conf.man.pre
+--- xorg-server-1.6.3.901.orig/hw/xfree86/doc/man/xorg.conf.man.pre
+++ xorg-server-1.6.3.901/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -470,6 +470,13 @@ This action is normally used to terminat
 When this option is enabled, the action has no effect.
 Default: off.