rpms/xorg-x11-drv-cirrus/devel cirrus-1.2.0-qemu.patch, 1.1, 1.2 xorg-x11-drv-cirrus.spec, 1.26, 1.27

[Adam Jackson]

Author: ajax

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

Modified Files:
	cirrus-1.2.0-qemu.patch xorg-x11-drv-cirrus.spec 
Log Message:
* Fri Feb 27 2009 Adam Jackson <ajax at redhat.com> 1.2.0-6
- Fix the qemu patch to, uh, work.


cirrus-1.2.0-qemu.patch:

Index: cirrus-1.2.0-qemu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-cirrus/devel/cirrus-1.2.0-qemu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cirrus-1.2.0-qemu.patch	27 Feb 2009 16:01:11 -0000	1.1
+++ cirrus-1.2.0-qemu.patch	27 Feb 2009 16:53:34 -0000	1.2
@@ -7,7 +7,7 @@
   	    xf86DoEDID_DDC2(pScrn->scrnIndex,pCir->I2CPtr1)));
 +#ifdef XSERVER_LIBPCIACCESS
 +     if (!pScrn->monitor->DDC &&
-+	 pCir->PciInfo->subvendor_id & 0xffff == 0x1af4) {
++	 ((pCir->PciInfo->subvendor_id & 0xffff) == 0x1af4)) {
 +	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 +		   "Defaulting to 1024x768 for QEMU\n");
 +	pScrn->monitor->nHsync = 1;


Index: xorg-x11-drv-cirrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-cirrus/devel/xorg-x11-drv-cirrus.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xorg-x11-drv-cirrus.spec	27 Feb 2009 16:01:12 -0000	1.26
+++ xorg-x11-drv-cirrus.spec	27 Feb 2009 16:53:35 -0000	1.27
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 cirrus video driver
 Name:      xorg-x11-drv-cirrus
 Version:   1.2.0
-Release:   5%{?dist}
+Release:   6%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -59,6 +59,9 @@
 %{_mandir}/man4/cirrus.4*
 
 %changelog
+* Fri Feb 27 2009 Adam Jackson <ajax at redhat.com> 1.2.0-6
+- Fix the qemu patch to, uh, work.
+
 * Fri Feb 27 2009 Adam Jackson <ajax at redhat.com> 1.2.0-5
 - cirrus-1.2.0-qemu.patch: Detect qemu virtual video when we can, and default
   to 1024x768 in that case. (#251264)