rpms/xorg-x11-drv-cirrus/devel cirrus-fix-24bpp.patch, NONE, 1.1 xorg-x11-drv-cirrus.spec, 1.20, 1.21

[Dave Airlie (airlied)]

Author: airlied

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

Modified Files:
	xorg-x11-drv-cirrus.spec 
Added Files:
	cirrus-fix-24bpp.patch 
Log Message:
* Thu Mar 13 2008 Dave Airlie <airlied at redhat.com> 1.1.0-9
- fix cirrus with no xorg.conf in qemu


cirrus-fix-24bpp.patch:

--- NEW FILE cirrus-fix-24bpp.patch ---
>From bc4e7dc5dae54c09b3eb0aca3b2cc93304f97f17 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at localhost.localdomain>
Date: Thu, 13 Mar 2008 12:39:51 +1000
Subject: [PATCH] cirrus: set default depth to 24bpp

this fixes autoconfiguation and it shouldn't override anything else.
---
 src/alp_driver.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/alp_driver.c b/src/alp_driver.c
index a282c21..cf41080 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -602,7 +602,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
 	 * The first thing we should figure out is the depth, bpp, etc.
 	 * We support both 24bpp and 32bpp layouts, so indicate that.
 	 */
-	if (!xf86SetDepthBpp(pScrn, 0, 0, 0, Support24bppFb | Support32bppFb |
+	if (!xf86SetDepthBpp(pScrn, 0, 0, 24, Support24bppFb | Support32bppFb |
 				SupportConvert32to24 | PreferConvert32to24)) {
 		return FALSE;
 	} else {
-- 
1.5.3.8



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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-x11-drv-cirrus.spec	20 Feb 2008 07:12:20 -0000	1.20
+++ xorg-x11-drv-cirrus.spec	13 Mar 2008 02:46:43 -0000	1.21
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 cirrus video driver
 Name:      xorg-x11-drv-cirrus
 Version:   1.1.0
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -17,6 +17,7 @@
 Source1:   cirrus.xinf
 
 Patch0: cirrus-pciaccess.patch
+Patch1: cirrus-fix-24bpp.patch
 
 BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
 BuildRequires: automake autoconf libtool pkgconfig
@@ -31,6 +32,7 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1 -b .pciaccess
+%patch1 -p1 -b .24bpp
 
 %build
 aclocal ; automake -a ; autoconf
@@ -61,6 +63,9 @@
 %{_mandir}/man4/cirrus.4*
 
 %changelog
+* Thu Mar 13 2008 Dave Airlie <airlied at redhat.com> 1.1.0-9
+- fix cirrus with no xorg.conf in qemu
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1.0-8
 - Autorebuild for GCC 4.3