rpms/xorg-x11-server/F-9 xorg-x11-server.spec, 1.348, 1.349 xserver-1.5.0-bad-fbdev-thats-mine.patch, 1.1, 1.2

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/xorg-x11-server/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2997

Modified Files:
	xorg-x11-server.spec xserver-1.5.0-bad-fbdev-thats-mine.patch 
Log Message:
pick up adam's sbus fix for fbdev conflict from rawhide


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xorg-x11-server.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- xorg-x11-server.spec	13 Dec 2008 16:47:12 -0000	1.348
+++ xorg-x11-server.spec	24 Dec 2008 15:44:34 -0000	1.349
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.2
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -467,6 +467,10 @@
 
 
 %changelog
+* Mon Dec 22 2008 Adam Jackson <ajax at redhat.com> 1.5.2-5
+- xserver-1.5.0-bad-fbdev-thats-mine.patch: Do the same for sbus that we do
+  for pci.
+
 * Sat Dec 13 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.5.2-4
 - sbusAutoDetection from upstream 
   http://cgit.freedesktop.org/xorg/xserver/commit/?id=24e863b0eb6ff11010a14cfd252a39df87a09d0e

xserver-1.5.0-bad-fbdev-thats-mine.patch:

Index: xserver-1.5.0-bad-fbdev-thats-mine.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xserver-1.5.0-bad-fbdev-thats-mine.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.5.0-bad-fbdev-thats-mine.patch	13 Mar 2008 06:37:36 -0000	1.1
+++ xserver-1.5.0-bad-fbdev-thats-mine.patch	24 Dec 2008 15:44:35 -0000	1.2
@@ -1,4 +1,4 @@
-From 656ca314bb97341a07d4bbd7fcfe7af9a3689761 Mon Sep 17 00:00:00 2001
+From cb1ac4a749a208eb8f9995042a110134977146d2 Mon Sep 17 00:00:00 2001
 From: Dave Airlie <airlied at panoply-rh.(none)>
 Date: Thu, 13 Mar 2008 16:16:46 +1000
 Subject: [PATCH] fbdev: make entity fail if PCI claimed already.
@@ -6,8 +6,8 @@
 bad kitty fbdev.
 ---
  hw/xfree86/common/xf86Bus.c   |    3 +++
- hw/xfree86/common/xf86fbBus.c |    3 +++
- 2 files changed, 6 insertions(+), 0 deletions(-)
+ 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
@@ -24,19 +24,23 @@
  	return NULL;
      
 diff --git a/hw/xfree86/common/xf86fbBus.c b/hw/xfree86/common/xf86fbBus.c
-index 102f6b1..48e101b 100644
+index 102f6b1..cfd8811 100644
 --- a/hw/xfree86/common/xf86fbBus.c
 +++ b/hw/xfree86/common/xf86fbBus.c
-@@ -58,6 +58,9 @@ xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active)
+@@ -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.5.4.3
+1.6.0.6