From 5ac01cc9b3aa4c07635a5a02432e5c36dee28932 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <whot@fedoraproject.org>
Date: Jul 06 2009 05:58:35 +0000
Subject: * Mon Jul 06 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99-9.20090706

- Today's git snapshot.
- xserver-1.5.0-bad-fbdev-thats-mine.patch: Drop. Merged upstream.

---

diff --git a/.cvsignore b/.cvsignore
index c977afb..f806e8b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xorg-server-20090618.tar.bz2
+xorg-server-20090706.tar.bz2
diff --git a/commitid b/commitid
index 93707b5..ca3fd1d 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-1e9907499c27321a2aa5dc8a75a375b7a82c999a
+89cf81cd85919e3dbb5adff5e6c6056c7990b60f
diff --git a/sources b/sources
index 9b89471..5dddc63 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ca0f369109b6f9bb62eca60fd5a2302f  xorg-server-20090618.tar.bz2
+f8acd1118a283e21fc3dcadbaf5334de  xorg-server-20090706.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index bd389c0..2380f0e 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-%define gitdate 20090618
+%define gitdate 20090706
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   8.%{gitdate}%{?dist}
+Release:   9.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -57,7 +57,6 @@ Patch2014:  xserver-1.5.0-projector-fb-size.patch
 # Trivial things to never merge upstream ever:
 # This really could be done prettier.
 Patch5002:  xserver-1.4.99-ssh-isnt-local.patch
-Patch5007:  xserver-1.5.0-bad-fbdev-thats-mine.patch
 
 # force mode debugging on for randr 1.2 drivers
 Patch6002: xserver-1.5.1-mode-debug.patch
@@ -517,6 +516,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 06 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99-9.20090706
+- Today's git snapshot.
+- xserver-1.5.0-bad-fbdev-thats-mine.patch: Drop. Merged upstream.
+
 * Mon Jun 29 2009 Adam Jackson <ajax@redhat.com> 1.6.99-8.20090618
 - Move xkb requires to -common subpackage, Xephyr needs them too.
 
diff --git a/xserver-1.5.0-bad-fbdev-thats-mine.patch b/xserver-1.5.0-bad-fbdev-thats-mine.patch
deleted file mode 100644
index a51920b..0000000
--- a/xserver-1.5.0-bad-fbdev-thats-mine.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From cb1ac4a749a208eb8f9995042a110134977146d2 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@panoply-rh.(none)>
-Date: Thu, 13 Mar 2008 16:16:46 +1000
-Subject: [PATCH] fbdev: make entity fail if PCI claimed already.
-
-bad kitty fbdev.
----
- hw/xfree86/common/xf86Bus.c   |    3 +++
- hw/xfree86/common/xf86fbBus.c |    7 +++++++
- 2 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
-index f7ffac8..9f4e0ca 100644
---- a/hw/xfree86/common/xf86Bus.c
-+++ b/hw/xfree86/common/xf86Bus.c
-@@ -458,6 +458,9 @@ xf86GetEntityInfo(int entityIndex)
-     EntityInfoPtr pEnt;
-     int i;
-     
-+    if (entityIndex == -1)
-+	return NULL;
-+
-     if (entityIndex >= xf86NumEntities)
- 	return NULL;
-     
-diff --git a/hw/xfree86/common/xf86fbBus.c b/hw/xfree86/common/xf86fbBus.c
-index 102f6b1..cfd8811 100644
---- a/hw/xfree86/common/xf86fbBus.c
-+++ b/hw/xfree86/common/xf86fbBus.c
-@@ -58,6 +58,13 @@ xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active)
- {
-     EntityPtr p;
-     int num;
-+
-+    if (pciSlotClaimed)
-+	return -1;
-+#if defined(__sparc__) || defined (__sparc64__)
-+    if (sbusSlotClaimed)
-+	return -1;
-+#endif
-     
-     num = xf86AllocateEntity();
-     p = xf86Entities[num];
--- 
-1.6.0.6
-