rpms/xorg-x11-server/devel xserver-1.6.99-use-pci-access-boot.patch, NONE, 1.1 xorg-x11-server.spec, 1.452, 1.453

[Dave Airlie]

Author: airlied

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.99-use-pci-access-boot.patch 
Log Message:
* Mon Jul 27 2009 Dave Airlie <airlied at redhat.com> 1.6.99-18.20090724
- xserver-1.6.99-use-pci-access-boot.patch: use pciaccess boot vga
- not sure what is up with the Conflicts stuff


xserver-1.6.99-use-pci-access-boot.patch:
 xf86pciBus.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE xserver-1.6.99-use-pci-access-boot.patch ---
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index 8ed3567..183b1ba 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -400,6 +400,11 @@ xf86PciProbe(void)
 	    xf86PciVideoInfo[num - 1] = info;
 
 	    pci_device_probe(info);
+
+		if (pci_device_is_boot_vga(info)) {
+			primaryBus.type = BUS_PCI;
+			primaryBus.id.pci = info;
+		}
 	    info->user_data = 0;
 	}
     }


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -p -r1.452 -r1.453
--- xorg-x11-server.spec	25 Jul 2009 04:50:28 -0000	1.452
+++ xorg-x11-server.spec	27 Jul 2009 05:26:40 -0000	1.453
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   17.%{gitdate}%{?dist}
+Release:   18.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -71,6 +71,7 @@ Patch6011: xserver-1.6.0-less-acpi-broke
 Patch6016: xserver-1.6.1-nouveau.patch
 
 Patch6022: xserver-1.6.0-primary.patch
+Patch6023: xserver-1.6.99-use-pci-access-boot.patch
 
 # ajax needs to upstream this
 Patch6027: xserver-1.6.0-displayfd.patch
@@ -117,7 +118,7 @@ BuildRequires: libXi-devel libXpm-devel 
 BuildRequires: libXv-devel
 
 # openssl? really?
-BuildRequires: pixman-devel libpciaccess-devel openssl-devel byacc flex
+BuildRequires: pixman-devel libpciaccess-devel >= 0.10.6-1 openssl-devel byacc flex
 BuildRequires: mesa-libGL-devel >= 7.1-0.37
 # XXX silly...
 BuildRequires: libdrm-devel >= 2.4.0 kernel-headers
@@ -176,7 +177,7 @@ Obsoletes: xorg-x11-drv-tek4957 <= 1.2.0
 Obsoletes: xorg-x11-drv-ur98 <= 1.1.0-5.fc9
 Obsoletes: xorg-x11-drv-wiimote <= 0.0.1-1.fc9
 # Force sufficiently new libpciaccess
-Conflicts: libpciaccess < 0.10.3-5
+Conflicts: libpciaccess < 0.10.6-1
 
 %description Xorg
 X.org X11 is an open source implementation of the X Window System.  It
@@ -523,6 +524,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 27 2009 Dave Airlie <airlied at redhat.com> 1.6.99-18.20090724
+- xserver-1.6.99-use-pci-access-boot.patch: use pciaccess boot vga
+- not sure what is up with the Conflicts stuff
+
 * Sat Jul 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-17.20090724
 - Bump release number.