From 8775f1e53e827b664c64f88ca39cc07262dac367 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@fedoraproject.org>
Date: Mar 30 2007 19:29:26 +0000
Subject: Fix domain breakage (#207659)


---

diff --git a/xorg-x11-server-1.2.99-unbreak-domain.patch b/xorg-x11-server-1.2.99-unbreak-domain.patch
new file mode 100644
index 0000000..b48f299
--- /dev/null
+++ b/xorg-x11-server-1.2.99-unbreak-domain.patch
@@ -0,0 +1,17 @@
+--- xorg-server-1.2.99.901/hw/xfree86/os-support/bus/linuxPci.c~	2006-11-16 18:01:25.000000000 +0000
++++ xorg-server-1.2.99.901/hw/xfree86/os-support/bus/linuxPci.c	2007-03-07 15:44:10.000000000 +0000
+@@ -158,7 +158,13 @@ linuxPciOpenFile(PCITAG tag, Bool write)
+ 		if (stat("/sys/bus/pci",&ignored) < 0)
+ 			is26 = 0;
+ 		else
+-			is26 = 1;
++			/* If we don't find the incompatible IA64 "domain support" in
++			   /proc/bus/pci then we don't know domain numbers. This means
++			   we ought to use /proc/bus/pci for accessing devices, instead
++			   of /sys/bus/pci. So in that case we just pretend it's a 2.4
++			   kernel, and hope the kernel has set up disjoint bus numbers
++			   for us, like it always used to. */
++			is26 = domain_support;
+ 	}
+ 	
+ 	if (!domain_support && domain > 0)
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 4626b26..1fd5319 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.2.99.902
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -28,6 +28,7 @@ Patch11:   xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch
 Patch12:   xorg-x11-server-1.1.1-graphics-expose.patch
 Patch15:   xorg-x11-server-1.1.1-automake-1.10-fixes.patch
 Patch18:   xorg-x11-server-1.1.1-glcore-visual-matching.patch
+Patch19:   xorg-x11-server-1.2.99-unbreak-domain.patch
 
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
@@ -252,6 +253,7 @@ Xserver source code needed to build VNC server (Xvnc)
 %patch12 -p1 -b .graphics-expose
 %patch15 -p1 -b .automake-1.10
 %patch18 -p1 -b .glcore-visual
+%patch19 -p1 -b .unbreak-domains
 
 %patch100 -p0 -b .no-move-damage
 %patch101 -p0 -b .dont-backfill-bg-none
@@ -561,6 +563,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar 30 2007 David Woodhouse <dwmw2@redhat.com> 1.2.99.902-2
+- Fix regression with PCI domains, but disjoint bus numbers (#207659)
+
 * Mon Mar 19 2007 Adam Jackson <ajax@redhat.com> 1.2.99.902-1
 - xserver 1.3 RC2.