From 0cf7b6df762c4946e1e6a06670d3c1dad665ed2c Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Jan 08 2009 15:06:55 +0000
Subject: * Thu Jan 08 2009 Adam Jackson <ajax@redhat.com> 1.5.99.3-8

- xserver-1.5.99.3-broken-mtrr-header.patch: Unbreak broken mtrr.h.

---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 4405f91..656987a 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.3
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -76,6 +76,8 @@ Patch6004: xserver-1.5.99.3-dmx-xcalloc.patch
 # 6005 should be in 1.5.99.4
 Patch6005: xserver-1.5.99.3-ddx-rules.patch
 Patch6006: xserver-1.5.99.3-offscreen-pixmaps.patch
+# hack around broken mtrr.h.  drop me as soon as possible.
+Patch6007: xserver-1.5.99.3-broken-mtrr-header.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -493,6 +495,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan 08 2009 Adam Jackson <ajax@redhat.com> 1.5.99.3-8
+- xserver-1.5.99.3-broken-mtrr-header.patch: Unbreak broken mtrr.h.
+
 * Wed Jan 07 2009 Adam Jackson <ajax@redhat.com> 1.5.99.3-7
 - xserver-1.5.99.3-offscreen-pixmaps.patch: Turn off offscreen pixmaps in XAA.
   Again.  Sigh.
diff --git a/xserver-1.5.99.3-broken-mtrr-header.patch b/xserver-1.5.99.3-broken-mtrr-header.patch
new file mode 100644
index 0000000..cfb2fd4
--- /dev/null
+++ b/xserver-1.5.99.3-broken-mtrr-header.patch
@@ -0,0 +1,37 @@
+From 32a51abce25df28d579eb73b42f06cc63741f17b Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 8 Jan 2009 10:03:52 -0500
+Subject: [PATCH] HACK: Work around broken mtrr.h
+
+---
+ hw/kdrive/src/kmap.c                    |    1 +
+ hw/xfree86/os-support/linux/lnx_video.c |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/hw/kdrive/src/kmap.c b/hw/kdrive/src/kmap.c
+index 60e8ae1..537d740 100644
+--- a/hw/kdrive/src/kmap.c
++++ b/hw/kdrive/src/kmap.c
+@@ -27,6 +27,7 @@
+ #include <unistd.h>
+ #include <sys/mman.h>
+ #ifdef HAVE_ASM_MTRR_H
++typedef unsigned int u32;
+ #include <asm/mtrr.h>
+ #endif
+ 
+diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
+index 688106a..535c3a0 100644
+--- a/hw/xfree86/os-support/linux/lnx_video.c
++++ b/hw/xfree86/os-support/linux/lnx_video.c
+@@ -44,6 +44,7 @@
+ #endif
+ 
+ #ifdef HAS_MTRR_SUPPORT
++typedef unsigned int u32;
+ #include <asm/mtrr.h>
+ #endif
+ 
+-- 
+1.6.0.3
+