rpms/xorg-x11-drv-qxl/devel qxl-remove-assert.patch, NONE, 1.1 xorg-x11-drv-qxl.spec, 1.2, 1.3

[Dave Airlie]

Author: airlied

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

Modified Files:
	xorg-x11-drv-qxl.spec 
Added Files:
	qxl-remove-assert.patch 
Log Message:
* Sat Mar 13 2010 Dave Airlie <airlied at redhat.com> 0.0.12-2
- fix bug in qxl with asserts


qxl-remove-assert.patch:
 qxl_driver.c |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE qxl-remove-assert.patch ---
>From 563f31ad081038ece8b5a5b525dd516fcd6ad0fd Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Sat, 13 Mar 2010 19:52:56 +1000
Subject: [PATCH] qxl: remove asserts that make no sense anymore

Not sure why nobody noticed these, once I dropped qxl into Fedora it asserted.
Looks like they were missed when p->Private was changed to an index.

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 src/qxl_driver.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index 25fe59b..187e581 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -1231,9 +1231,6 @@ qxl_valid_mode(int scrn, DisplayModePtr p, Bool flag, int pass)
 
     p->Private = (void *)(unsigned long)mode_idx;
 
-    assert (((struct qxl_mode *)p->Private)->x_res == p->HDisplay);
-    assert (((struct qxl_mode *)p->Private)->y_res == p->VDisplay);
-    
     return MODE_OK;
 }
 
-- 
1.6.6



Index: xorg-x11-drv-qxl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-qxl/devel/xorg-x11-drv-qxl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xorg-x11-drv-qxl.spec	13 Mar 2010 08:31:18 -0000	1.2
+++ xorg-x11-drv-qxl.spec	13 Mar 2010 10:01:49 -0000	1.3
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 qxl video driver
 Name:      xorg-x11-drv-qxl
 Version:   0.0.12
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License: MIT
@@ -20,11 +20,14 @@ BuildRequires: glib2-devel
 
 Requires:  xorg-x11-server-Xorg >= 1.1.0-1
 
+Patch0: qxl-remove-assert.patch
+
 %description 
 X.Org X11 qxl video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .assert
 
 %build
 %configure --disable-static
@@ -48,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{driverdir}/qxl_drv.so
 
 %changelog
+* Sat Mar 13 2010 Dave Airlie <airlied at redhat.com> 0.0.12-2
+- fix bug in qxl with asserts
+
 * Sat Mar 13 2010 Dave Airlie <airlied at redhat.com> 0.0.12-1
 - rebase to 0.0.12 release - fix some 16-bit bugs