rpms/xorg-x11-server/F-9 xserver-1.5.0-fix-single-aspect.patch, NONE, 1.1 xorg-x11-server.spec, 1.336, 1.337

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25161

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.0-fix-single-aspect.patch 
Log Message:
* Thu Jun 12 2008 Dave Airlie <airlied at redhat.com> 1.4.99.902-3.20080612
- xserver-1.5.0-fix-single-aspect.patch - fix 2560x1600 on my monitor.


xserver-1.5.0-fix-single-aspect.patch:

--- NEW FILE xserver-1.5.0-fix-single-aspect.patch ---
>From 21248705bbd9876ea6d2d78a85bedc4904c63899 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Thu, 12 Jun 2008 14:54:56 +1000
Subject: [PATCH] modes: make aspect choosing work on single output case.

In the single output enabled case we never enter the loop and test
never gets set and so we fail to match a good mode.

This was causing my 2560x1600 to end up at 2048x1536.
---
 hw/xfree86/modes/xf86Crtc.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 855d646..02c447d 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1854,6 +1854,7 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)
 
     nextEnabledOutput(config, enabled, &o);
     while ((mode = nextAspectMode(config->output[o], mode, aspect))) {
+	test = mode;
 	for (p = o; nextEnabledOutput(config, enabled, &p); ) {
 	    test = xf86OutputFindClosestMode(config->output[p], mode);
 	    if (!test)
-- 
1.5.5.1



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xorg-x11-server.spec,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- xorg-x11-server.spec	12 Jun 2008 02:07:31 -0000	1.336
+++ xorg-x11-server.spec	12 Jun 2008 04:58:20 -0000	1.337
@@ -20,7 +20,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.902
-Release:   2.%{gitdate}%{?dist}
+Release:   3.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -60,6 +60,7 @@
 Patch5007:  xserver-1.5.0-bad-fbdev-thats-mine.patch
 Patch5008:  xserver-1.5.0-xaa-sucks.patch
 Patch5009:  xserver-1.5.0-no-evdev-keyboards-kthnx.patch
+Patch5010:  xserver-1.5.0-fix-single-aspect.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -510,6 +511,9 @@
 
 
 %changelog
+* Thu Jun 12 2008 Dave Airlie <airlied at redhat.com> 1.4.99.902-3.20080612
+- xserver-1.5.0-fix-single-aspect.patch - fix 2560x1600 on my monitor.
+
 * Thu Jun 12 2008 Dave Airlie <airlied at redhat.com> 1.4.99.902-2.20080612
 - cve-2008-1377: Record and Security Extension Input validation
 - cve-2008-1379: MIT-SHM extension Input Validation flaw