--- xserver-xorg-video-cirrus-1.4.0.orig/autogen.sh
+++ xserver-xorg-video-cirrus-1.4.0/autogen.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
--- xserver-xorg-video-cirrus-1.4.0.orig/debian/watch
+++ xserver-xorg-video-cirrus-1.4.0/debian/watch
@@ -0,0 +1,3 @@
+#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-cirrus
+version=3
+http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-cirrus-(.*)\.tar\.gz
--- xserver-xorg-video-cirrus-1.4.0.orig/debian/xserver-xorg-video-cirrus.links
+++ xserver-xorg-video-cirrus-1.4.0/debian/xserver-xorg-video-cirrus.links
@@ -0,0 +1 @@
+usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-cirrus/script
--- xserver-xorg-video-cirrus-1.4.0.orig/debian/compat
+++ xserver-xorg-video-cirrus-1.4.0/debian/compat
@@ -0,0 +1 @@
+8
--- xserver-xorg-video-cirrus-1.4.0.orig/debian/README.source
+++ xserver-xorg-video-cirrus-1.4.0/debian/README.source
@@ -0,0 +1,49 @@
+------------------------------------------------------
+Quick Guide To Patching This Package For The Impatient
+------------------------------------------------------
+
+1. Make sure you have quilt installed
+2. Unpack the package as usual with "dpkg-source -x"
+3. Run the "patch" target in debian/rules
+4. Create a new patch with "quilt new" (see quilt(1))
+5. Edit all the files you want to include in the patch with "quilt edit" 
+   (see quilt(1)).
+6. Write the patch with "quilt refresh" (see quilt(1))
+7. Run the "clean" target in debian/rules
+
+Alternatively, instead of using quilt directly, you can drop the patch in to 
+debian/patches and add the name of the patch to debian/patches/series.
+
+------------------------------------
+Guide To The X Strike Force Packages
+------------------------------------
+
+The X Strike Force team maintains X packages in git repositories on
+git.debian.org in the pkg-xorg subdirectory. Most upstream packages
+are actually maintained in git repositories as well, so they often
+just need to be pulled into git.debian.org in a "upstream-*" branch.
+Otherwise, the upstream sources are manually installed in the Debian
+git repository.
+
+The .orig.tar.gz upstream source file could be generated using this
+"upstream-*" branch in the Debian git repository but it is actually
+copied from upstream tarballs directly.
+
+Due to X.org being highly modular, packaging all X.org applications
+as their own independent packages would have created too many Debian
+packages. For this reason, some X.org applications have been grouped
+into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
+x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
+Most packages, including the X.org server itself and all libraries
+and drivers are, however maintained independently.
+
+The Debian packaging is added by creating the "debian-*" git branch
+which contains the aforementioned "upstream-*" branch plus the debian/
+repository files.
+When a patch has to be applied to the Debian package, two solutions
+are involved:
+* If the patch is available in one of the upstream branches, it
+  may be git'cherry-picked into the Debian repository. In this
+  case, it appears directly in the .diff.gz.
+* Otherwise, the patch is added to debian/patches/ which is managed
+  with quilt as documented in /usr/share/doc/quilt/README.source.
--- xserver-xorg-video-cirrus-1.4.0.orig/debian/copyright
+++ xserver-xorg-video-cirrus-1.4.0/debian/copyright
@@ -0,0 +1,67 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
+Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from the XFree86
+Project.
+
+Copyright 2000 by Egbert Eich
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Alan Hourihane not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Alan Hourihane makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+EGBERT EICH DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright 2007 George Sapountzis
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- xserver-xorg-video-cirrus-1.4.0.orig/debian/changelog
+++ xserver-xorg-video-cirrus-1.4.0/debian/changelog
@@ -0,0 +1,294 @@
+xserver-xorg-video-cirrus (1:1.4.0-2.26.201403160746) ucs4-0-0-0; urgency=low
+
+  * UCS auto build. No patches were applied to the original source package
+
+ -- Univention builddaemon <buildd@univention.de>  Sun, 16 Mar 2014 07:46:28 +0100
+
+xserver-xorg-video-cirrus (1:1.4.0-2) unstable; urgency=low
+
+  * cirrus: don't bind if there is a PCI kernel driver loaded, for
+    compatibility with the cirrus KMS driver in Linux 3.5.
+
+ -- Julien Cristau <jcristau@debian.org>  Mon, 16 Jul 2012 22:41:46 +0200
+
+xserver-xorg-video-cirrus (1:1.4.0-1) unstable; urgency=low
+
+  * New upstream release:
+    - Add support for Xserver 1.12.
+  * Drop patch (merged upstream):
+    - 20-faumachine-maxpitch.diff
+
+ -- Cyril Brulebois <kibi@debian.org>  Mon, 02 Apr 2012 02:12:51 +0000
+
+xserver-xorg-video-cirrus (1:1.3.2-4) unstable; urgency=low
+
+  * Switch to dh:
+    - Use debhelper 8.
+    - Use dh-autoreconf.
+    - Bump xserver-xorg-dev build-dep for dh_xsf_substvars and xsf
+      debhelper sequence.
+    - Specify usr/share/man in .install, remove .manpages accordingly.
+  * Remove xsfbs accordingly.
+  * Update Uploaders list. Thanks, David & Brice!
+  * Remove long obsolete Replaces/Conflicts.
+  * Wrap Depends/Provides.
+  * Bump Standards-Version to 3.9.1 (no changes needed).
+
+ -- Cyril Brulebois <kibi@debian.org>  Sat, 05 Feb 2011 14:43:10 +0100
+
+xserver-xorg-video-cirrus (1:1.3.2-3) experimental; urgency=low
+
+  * Build against Xserver 1.9.1 rc1.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sat, 16 Oct 2010 17:38:38 +0200
+
+xserver-xorg-video-cirrus (1:1.3.2-2+squeeze1) unstable; urgency=low
+
+  * Add 10-qemu.diff, stolen from Fedora, making the driver default to
+    1024x768 instead of 800x600 for the device simulated by QEMU. Thanks
+    to Guido Günther for the pointer to that pretty ugly yet useful hack
+    (Closes: #586693).
+  * Add a dependency from configure to $(STAMP_DIR)/patch to get patches
+    applied.
+  * Add quilt build-dep accordingly.
+  * Add 20-faumachine-maxpitch.diff, stolen from Ubuntu, fixing pitch
+    issues with GD5446, which is the device simulated by FAUmachine.
+
+ -- Cyril Brulebois <kibi@debian.org>  Wed, 12 Jan 2011 03:51:33 +0100
+
+xserver-xorg-video-cirrus (1:1.3.2-2) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+    good reason.  Thanks, Colin Watson!
+  * Remove myself from Uploaders
+
+  [ Cyril Brulebois ]
+  * Update to new xsfbs, replace deprecated ${xserver:Depends} with
+    ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
+    accordingly.
+  * Add myself to Uploaders.
+  * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
+
+ -- Cyril Brulebois <kibi@debian.org>  Mon, 03 May 2010 23:03:28 +0200
+
+xserver-xorg-video-cirrus (1:1.3.2-1) experimental; urgency=low
+
+  [ Timo Aaltonen ]
+  * New upstream release.
+  * Bump Standards-Version to 3.8.3.
+  * Build against Xserver 1.7.
+
+  [ Cyril Brulebois ]
+  * Upload to experimental.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sun, 06 Dec 2009 03:24:06 +0100
+
+xserver-xorg-video-cirrus (1:1.3.1-1) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * Update debian/copyright from upstream's COPYING.
+
+  [ Brice Goglin ]
+  * New upstream release.
+  * Bump Standards-Version to 3.8.2.
+
+ -- Brice Goglin <bgoglin@debian.org>  Sun, 19 Jul 2009 23:52:36 +0200
+
+xserver-xorg-video-cirrus (1:1.3.0-1) unstable; urgency=low
+
+  [ David Nusinow ]
+  * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+    pick a driver during autoconfig.
+    + Disable patch system and remove quilt from build-dep
+
+  [ Julien Cristau ]
+  * New upstream release.
+  * Add README.source, bump Standards-Version to 3.8.1.
+
+ -- Julien Cristau <jcristau@debian.org>  Mon, 08 Jun 2009 18:00:08 +0200
+
+xserver-xorg-video-cirrus (1:1.2.1-4) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 09 Apr 2009 09:57:09 +0100
+
+xserver-xorg-video-cirrus (1:1.2.1-3) experimental; urgency=low
+
+  * Merge changes from 1:1.2.1-1.lenny1.
+  * Run autoreconf on build.  Build-depend on automake, libtool and
+    xutils-dev.
+  * Handle parallel builds.
+  * Build against xserver 1.6 rc1.
+  * Add myself to Uploaders.
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 25 Jan 2009 21:39:31 +0100
+
+xserver-xorg-video-cirrus (1:1.2.1-2) experimental; urgency=low
+
+  * Build against xserver 1.5.
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 04 Sep 2008 14:49:26 +0200
+
+xserver-xorg-video-cirrus (1:1.2.1-1.lenny1) unstable; urgency=high
+
+  * Cherry-pick from upstream:
+    alpine: fix order of arguments of PCI_WRITE_LONG().
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 25 Jan 2009 21:10:09 +0100
+
+xserver-xorg-video-cirrus (1:1.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove XS- prefix to Vcs-* fields in debian/rules.
+  * Bump Standards-Version to 3.7.3, no change needed.
+  * Run dpkg-shlibdeps with --warnings=6.  Drivers reference symbols from
+    /usr/bin/Xorg and other modules, and that's not a bug, so we want
+    dpkg-shlibdeps to shut up about symbols it can't find.
+    + Build-depend on dpkg-dev >= 1.14.17.
+
+ -- Brice Goglin <bgoglin@debian.org>  Thu, 22 May 2008 08:34:50 +0200
+
+xserver-xorg-video-cirrus (1:1.1.0-8) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org>  Sun, 16 Sep 2007 15:43:43 -0400
+
+xserver-xorg-video-cirrus (1:1.1.0-7) experimental; urgency=low
+
+  * Add 01_gen_pci_ids.diff
+    This patch provides a set of PCI ID's supported by this driver so that it
+    can be autoloaded by the X server
+
+ -- David Nusinow <dnusinow@debian.org>  Fri, 14 Sep 2007 00:18:25 -0400
+
+xserver-xorg-video-cirrus (1:1.1.0-6) experimental; urgency=low
+
+  [ Julien Cristau ]
+  * Add link to xserver-xorg-core bug script, so that bugreports contain
+    the user's config and log files.
+  * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous
+    versions don't have the bug script.
+
+  [ Timo Aaltonen ]
+  * Replaces/Conflicts: xserver-xorg-driver-cirrus.
+
+  [ Brice Goglin ]
+  * Pull upstream manpage fix 43d9703ddf79314015b66c81c671ef254fbb3934
+  * Install the upstream changelog.
+  * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
+    (needed to let xsfbs get access to serverminver).
+  * Add XS-Vcs-*.
+  * Add a link to www.X.org and a reference to the xf86-video-cirrus
+    module in the long description.
+  * Add myself to uploaders, and remove Branden and Fabio with their
+    permission.
+  * Build against xserver 1.4.
+  * Add upstream URL to debian/copyright.
+
+ -- Brice Goglin <bgoglin@debian.org>  Thu, 13 Sep 2007 22:09:13 +0200
+
+xserver-xorg-video-cirrus (1:1.1.0-5) experimental; urgency=low
+
+  * Minor updates from upstream
+  * Generate server dependencies automatically from the ABI
+
+ -- David Nusinow <dnusinow@debian.org>  Wed, 21 Feb 2007 22:54:19 -0500
+
+xserver-xorg-video-cirrus (1:1.1.0-3) unstable; urgency=low
+
+  [ Steve Langasek ]
+  * Prepare for upload to unstable
+
+  [ Drew Parsons ]
+  * Standards version 3.7.2.
+  * Use debhelper 5.
+  * Use dh_installman to install man pages.
+  * Exclude .la files from dh_install.
+
+ -- David Nusinow <dnusinow@debian.org>  Mon, 18 Sep 2006 19:57:31 -0400
+
+xserver-xorg-video-cirrus (1:1.1.0-2) experimental; urgency=low
+
+  [ Drew Parsons ]
+  *  Provides: xserver-xorg-video-1.0 not xserver-xorg-video.
+
+  [ David Nusinow ]
+  * Bump xserver (build-)depends epochs to 2: to deal with botched
+    server upload
+
+ -- David Nusinow <dnusinow@debian.org>  Tue, 22 Aug 2006 23:46:28 +0000
+
+xserver-xorg-video-cirrus (1:1.1.0-1) experimental; urgency=low
+
+  [ Andres Salomon ]
+  * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
+    idempotency fix.
+  * Run dh_install w/ --list-missing.
+
+  [ David Nusinow ]
+  * New upstream release
+  * Bump dependency on xserver-xorg-core to >= 1:1.1.1. Do the same thing for
+    the build-dep on xserver-xorg-dev.
+
+ -- David Nusinow <dnusinow@debian.org>  Mon,  7 Aug 2006 19:42:05 +0000
+
+xserver-xorg-video-cirrus (1:1.0.0.5-2) unstable; urgency=low
+
+  * Upload to modular
+
+ -- David Nusinow <dnusinow@debian.org>  Sun, 26 Mar 2006 20:25:29 -0500
+
+xserver-xorg-video-cirrus (1:1.0.0.5-1) experimental; urgency=low
+
+  * First upload to Debian
+  * Change source package, package, and provides names to denote the
+    type of driver and that they are for xserver-xorg
+
+ -- David Nusinow <dnusinow@debian.org>  Fri, 13 Jan 2006 00:36:15 -0500
+
+xserver-xorg-driver-cirrus (1:1.0.0.5-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+  * Add provides on xserver-xorg-driver.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Wed,  4 Jan 2006 19:54:22 +1100
+
+xserver-xorg-driver-cirrus (1:1.0.0.4-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 19 Dec 2005 09:03:03 +1100
+
+xserver-xorg-driver-cirrus (1:1.0.0.3-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 12 Dec 2005 13:01:04 +1100
+
+xserver-xorg-driver-cirrus (1:1.0.0.2-0ubuntu2) dapper; urgency=low
+
+  * Add missing Build-Depends (x11proto-core-dev, x11proto-fonts-dev,
+    x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev).
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon,  5 Dec 2005 12:52:41 +1100
+
+xserver-xorg-driver-cirrus (1:1.0.0.2-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Tue, 22 Nov 2005 13:27:46 +1100
+
+xserver-xorg-driver-cirrus (1:1.0.0.1-1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Tue, 25 Oct 2005 16:59:23 +1000
+
+xserver-xorg-driver-cirrus (1:1.0.0-1) breezy; urgency=low
+
+  * First xserver-xorg-driver-cirrus release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Wed,  6 Jul 2005 15:48:17 +1000
--- xserver-xorg-video-cirrus-1.4.0.orig/debian/control
+++ xserver-xorg-video-cirrus-1.4.0/debian/control
@@ -0,0 +1,38 @@
+Source: xserver-xorg-video-cirrus
+Section: x11
+Priority: optional
+Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Uploaders: Cyril Brulebois <kibi@debian.org>
+Build-Depends:
+ debhelper (>= 8),
+ dh-autoreconf,
+ quilt,
+ pkg-config,
+ xserver-xorg-dev (>= 2:1.9.4),
+ x11proto-video-dev,
+ x11proto-core-dev,
+ x11proto-fonts-dev,
+ x11proto-randr-dev,
+ x11proto-render-dev,
+ x11proto-xext-dev,
+ xutils-dev
+Standards-Version: 3.9.1
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-cirrus
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-cirrus.git
+
+Package: xserver-xorg-video-cirrus
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${xviddriver:Depends},
+Provides:
+ ${xviddriver:Provides}
+Description: X.Org X server -- Cirrus display driver
+ This package provides the driver for the Cirrus Logic family of video
+ cards.
+ .
+ More information about X.Org can be found at:
+ <URL:http://www.X.org>
+ .
+ This package is built from the X.org xf86-video-cirrus driver module.
--- xserver-xorg-video-cirrus-1.4.0.orig/debian/xserver-xorg-video-cirrus.install
+++ xserver-xorg-video-cirrus-1.4.0/debian/xserver-xorg-video-cirrus.install
@@ -0,0 +1,2 @@
+usr/lib/xorg/modules/drivers/*.so
+usr/share/man
--- xserver-xorg-video-cirrus-1.4.0.orig/debian/rules
+++ xserver-xorg-video-cirrus-1.4.0/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+# Install in debian/tmp to retain control through dh_install:
+override_dh_auto_install:
+	dh_auto_install --destdir=debian/tmp
+
+# Kill *.la files, and forget no-one:
+override_dh_install:
+	find debian/tmp -name '*.la' -delete
+	dh_install --fail-missing
+
+# That's a plugin, use appropriate warning level:
+override_dh_shlibdeps:
+	dh_shlibdeps -- --warnings=6
+
+%:
+	dh $@ --with quilt,autoreconf,xsf --builddirectory=build/
--- xserver-xorg-video-cirrus-1.4.0.orig/debian/patches/series
+++ xserver-xorg-video-cirrus-1.4.0/debian/patches/series
@@ -0,0 +1 @@
+10-qemu.diff
--- xserver-xorg-video-cirrus-1.4.0.orig/debian/patches/10-qemu.diff
+++ xserver-xorg-video-cirrus-1.4.0/debian/patches/10-qemu.diff
@@ -0,0 +1,28 @@
+Default to 1024x768 for Qemu.
+
+Stolen from Fedora.
+
+Pointed out by Guido Günther <agx@sigxcpu.org> in #586693.
+--- a/src/alp_driver.c
++++ b/src/alp_driver.c
+@@ -734,6 +734,20 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+      else
+  	xf86SetDDCproperties(pScrn,xf86PrintEDID(
+  	    xf86DoEDID_DDC2(pScrn->scrnIndex,pCir->I2CPtr1)));
++#ifdef XSERVER_LIBPCIACCESS
++     if (!pScrn->monitor->DDC &&
++	 ((pCir->PciInfo->subvendor_id & 0xffff) == 0x1af4)) {
++	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
++		   "Defaulting to 1024x768 for QEMU\n");
++	pScrn->monitor->nHsync = 1;
++	pScrn->monitor->hsync[0].lo = 31.5;
++	pScrn->monitor->hsync[0].hi = 48.0;
++	pScrn->monitor->nVrefresh = 1;
++	pScrn->monitor->vrefresh[0].lo = 56.0;
++	pScrn->monitor->vrefresh[0].hi = 60.1;
++	pScrn->monitor->maxPixClock = 65000;
++     }
++#endif
+  
+      /* Probe the possible LCD display */
+      AlpProbeLCD(pScrn);
--- xserver-xorg-video-cirrus-1.4.0.orig/src/cir_driver.c
+++ xserver-xorg-video-cirrus-1.4.0/src/cir_driver.c
@@ -256,6 +256,17 @@
  	   they should be handled in this driver (as opposed to their
  	   own driver). */
 	pPci = xf86GetPciInfoForEntity(usedChips[i]);
+
+#ifdef XSERVER_LIBPCIACCESS
+    if (pci_device_has_kernel_driver(pPci)) {
+        xf86DrvMsg(0, X_ERROR,
+                   "cirrus: The PCI device 0x%x at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n",
+                   pPci->device_id, pPci->bus, pPci->domain, pPci->dev, pPci->func);
+        xf86DrvMsg(0, X_ERROR,
+                   "cirrus: This driver cannot operate until it has been unloaded.\n");
+        return FALSE;
+    }
+#endif
 	pScrn = NULL;
  	if (pPci && (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5462 ||
 		     PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5464 ||
