[xorg-x11-drv-cirrus] latest upstream release

[Dave Airlie]

commit 590ea5889a733829f826d7a889eae054e7b84b83
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Jul 18 03:10:43 2012 -0400

    latest upstream release

 .gitignore               |    1 +
 cirrus-1.2.0-qemu.patch  |   14 +++++++-------
 cirrus-no-kms.patch      |   37 -------------------------------------
 sources                  |    2 +-
 xorg-x11-drv-cirrus.spec |    9 +++++----
 5 files changed, 14 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ff43750..e0d4695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xf86-video-cirrus-1.3.2.tar.bz2
 /xf86-video-cirrus-1.4.0.tar.bz2
+/xf86-video-cirrus-1.5.1.tar.bz2
diff --git a/cirrus-1.2.0-qemu.patch b/cirrus-1.2.0-qemu.patch
index 5bcfda8..4df2a40 100644
--- a/cirrus-1.2.0-qemu.patch
+++ b/cirrus-1.2.0-qemu.patch
@@ -1,16 +1,16 @@
-diff -up xf86-video-cirrus-1.2.0/src/alp_driver.c.jx xf86-video-cirrus-1.2.0/src/alp_driver.c
---- xf86-video-cirrus-1.2.0/src/alp_driver.c.jx	2008-03-19 10:29:23.000000000 -0400
-+++ xf86-video-cirrus-1.2.0/src/alp_driver.c	2009-02-27 10:59:27.000000000 -0500
-@@ -812,6 +812,12 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
-      else
+diff -up xf86-video-cirrus-1.5.1/src/alp_driver.c.qemu xf86-video-cirrus-1.5.1/src/alp_driver.c
+--- xf86-video-cirrus-1.5.1/src/alp_driver.c.qemu	2012-07-15 22:02:41.000000000 -0400
++++ xf86-video-cirrus-1.5.1/src/alp_driver.c	2012-07-18 03:09:41.634430677 -0400
+@@ -776,6 +776,12 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
   	xf86SetDDCproperties(pScrn,xf86PrintEDID(
-  	    xf86DoEDID_DDC2(pScrn->scrnIndex,pCir->I2CPtr1)));
+ 		 xf86DoEDID_DDC2(XF86_SCRN_ARG(pScrn),pCir->I2CPtr1)));
+  
 +#ifdef XSERVER_LIBPCIACCESS
 +     if (!pScrn->monitor->DDC &&
 +	 ((pCir->PciInfo->subvendor_id & 0xffff) == 0x1af4)) {
 +        pCir->NoAccel = TRUE;
 +     }
 +#endif
-  
       /* Probe the possible LCD display */
       AlpProbeLCD(pScrn);
+ 
diff --git a/sources b/sources
index ab469f0..982705e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1e449789da866f974dbf6cbe3c8cc7bf  xf86-video-cirrus-1.4.0.tar.bz2
+16ea047a601896fb0ec995dbe9fb7ef2  xf86-video-cirrus-1.5.1.tar.bz2
diff --git a/xorg-x11-drv-cirrus.spec b/xorg-x11-drv-cirrus.spec
index 6beae07..d903d56 100644
--- a/xorg-x11-drv-cirrus.spec
+++ b/xorg-x11-drv-cirrus.spec
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 cirrus video driver
 Name:      xorg-x11-drv-cirrus
-Version:   1.4.0
-Release:   2%{?dist}
+Version:   1.5.1
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -16,7 +16,6 @@ Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
 Patch0:	    cirrus-1.2.0-qemu.patch
 Patch3:	    cirrus-1.3.2-virt-16bpp.patch
-Patch4:     cirrus-no-kms.patch
 
 BuildRequires: xorg-x11-server-sdk >= 1.10.99.902
 BuildRequires: xorg-x11-util-macros >= 1.1.5
@@ -31,7 +30,6 @@ X.Org X11 cirrus video driver.
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1 -b .qemu
 %patch3 -p1 -b .16bpp
-%patch4 -p1 -b .nokms
 
 %build
 %configure --disable-static
@@ -57,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/cirrus.4*
 
 %changelog
+* Wed Jul 18 2012 Dave Airlie <airlied at redhat.com> 1.5.1-1
+- latest upstream release
+
 * Fri May 25 2012 Dave Airlie <airlied at redhat.com> 1.4.0-2
 - don't load the cirrus driver if kms driver loaded.