today's git snapshot

.cvsignore

@@ -1 +1 @@
-xorg-server-20080221.tar.bz2
+xorg-server-20080222.tar.bz2

commitid

@@ -1 +1 @@
-c14fd2a5cb3f45d5c4502e09f55f5e3732c5e698
+347db49ebe4596db16455ea8a1a608cfa826c5c7

sources

@@ -1 +1 @@
-d3dd5a48d161bcb5d02cf897b1f49ebd  xorg-server-20080221.tar.bz2
+43e13379e5ef621ba5c94bb0623bf53d  xorg-server-20080222.tar.bz2

xorg-x11-server.spec

@@ -15,12 +15,12 @@
 # RHEL5 bugfix sync
 
 %define pkgname xorg-server
-%define gitdate 20080221
+%define gitdate 20080222
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.1
-Release:   0.22.%{?gitdate}%{?dist}
+Release:   0.23.%{?gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -57,13 +57,9 @@ Patch2007:  xserver-1.3.0-randr12-config-hack.patch
 Patch2013:  xserver-1.4.99-document-fontpath-correctly.patch
 
 # Trivial things to maybe merge upstream at next rebase
-#Patch4003: argh-pixman.patch #fixme
+#Patch4000:
-Patch4004: xserver-1.4.99-xephyr-dri.patch
-Patch4005: xserver-1.4.99-openchrome.patch
 
 # Trivial things to never merge upstream ever
-# This should be fixed in the kernel.
-Patch5000: xserver-1.4.99-apm-typedefs.patch
 # Don't merge this without protecting the gccisms.
 Patch5001: xserver-1.4.99-alloca-poison.patch
 # This really could be done prettier.
@@ -513,6 +509,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Feb 22 2008 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.23
+- Today's git snapshot.  Xinerama and XKB fixes, patch merging, etc.
+- Remove some dead patches.
+
 * Thu Feb 21 2008 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.22
 - Today's git snapshot, misc bugfixes.
 

xserver-1.4.99-apm-typedefs.patch

@@ -1,40 +0,0 @@
-From 3fd969f08e4f550ac28fee3bbdbe55e9db872091 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 3 Dec 2007 14:00:25 -0500
-Subject: [PATCH] apm_event_t workaround
-
----
- hw/kdrive/linux/linux.c               |    2 ++
- hw/xfree86/os-support/linux/lnx_apm.c |    3 +++
- 2 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c
-index 23cd8f5..2f9cb62 100644
---- a/hw/kdrive/linux/linux.c
-+++ b/hw/kdrive/linux/linux.c
-@@ -275,6 +275,8 @@ LinuxApmBlock (pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
- 
- static Bool LinuxApmRunning;
- 
-+#define apm_event_t unsigned short
-+
- static void
- LinuxApmWakeup (pointer blockData, int result, pointer pReadmask)
- {
-diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c
-index 16ac80d..6bcae47 100644
---- a/hw/xfree86/os-support/linux/lnx_apm.c
-+++ b/hw/xfree86/os-support/linux/lnx_apm.c
-@@ -39,6 +39,9 @@ static PMClose lnxAPMOpen(void);
- static void lnxCloseAPM(void);
- static pointer APMihPtr = NULL;
- 
-+/* XXX this is wrong, do not ever commit me upstream */
-+#define apm_event_t unsigned short
-+
- static struct {
-     apm_event_t apmLinux;
-     pmEvent xf86;
--- 
-1.5.2.4
-

xserver-1.4.99-openchrome.patch

@@ -1,25 +0,0 @@
-From 59681e08381f8ca83263a6313b43905909e68583 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 28 Nov 2007 12:09:16 -0500
-Subject: [PATCH] via -> openchrome
-
----
- hw/xfree86/common/xf86AutoConfig.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index c6e1972..da6c3f3 100644
---- a/hw/xfree86/common/xf86AutoConfig.c
-+++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -184,7 +184,7 @@ videoPtrToDriverName(struct pci_device *dev)
- 	case 0x3d3d:		    return "glint";
- 	case 0x1023:		    return "trident";
- 	case 0x100c:		    return "tseng";
--	case 0x1106:		    return "via";
-+	case 0x1106:		    return "openchrome";
- 	case 0x15ad:		    return "vmware";
- 	default: break;
-     }
--- 
-1.5.3.4
-

xserver-1.4.99-xephyr-dri.patch

@@ -1,43 +0,0 @@
-From 694c5c5528b13128cbd0857351d041a6c06e2607 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 27 Nov 2007 15:14:20 -0500
-Subject: [PATCH] Ugly hack to fix xephyr dri.
-
----
- hw/kdrive/ephyr/XF86dri.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/hw/kdrive/ephyr/XF86dri.c b/hw/kdrive/ephyr/XF86dri.c
-index c11da06..506d7be 100644
---- a/hw/kdrive/ephyr/XF86dri.c
-+++ b/hw/kdrive/ephyr/XF86dri.c
-@@ -385,7 +385,7 @@ Bool XF86DRICreateContext(dpy, screen, visual, context, hHWContext)
- 					   context, hHWContext );
- }
- 
--Bool XF86DRIDestroyContext( __DRInativeDisplay * ndpy, int screen, __DRIid context)
-+GLboolean XF86DRIDestroyContext( __DRInativeDisplay * ndpy, int screen, __DRIid context)
- {
-     Display * const dpy = (Display *) ndpy;
-     XExtDisplayInfo *info = find_display (dpy);
-@@ -406,7 +406,7 @@ Bool XF86DRIDestroyContext( __DRInativeDisplay * ndpy, int screen, __DRIid conte
-     return True;
- }
- 
--Bool
-+GLboolean
- XF86DRICreateDrawable (__DRInativeDisplay * ndpy, int screen,
-                        __DRIid drawable, drm_drawable_t * hHWDrawable)
- {
-@@ -437,7 +437,7 @@ XF86DRICreateDrawable (__DRInativeDisplay * ndpy, int screen,
-     return True;
- }
- 
--Bool XF86DRIDestroyDrawable( __DRInativeDisplay * ndpy, int screen,
-+GLboolean XF86DRIDestroyDrawable( __DRInativeDisplay * ndpy, int screen,
-     __DRIid drawable )
- {
-     Display * const dpy = (Display *) ndpy;
--- 
-1.5.3.4
-