rpms/xorg-x11-server/devel xserver-1.6.0-preferred-thinko.patch, NONE, 1.1 xorg-x11-server.spec, 1.414, 1.415

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.0-preferred-thinko.patch 
Log Message:
* Mon Mar 02 2009 Adam Jackson <ajax at redhat.com> 1.6.0-3
- xserver-1.6.0-preferred-thinko.patch: Fix a thinko in output setup when
  only one head is attached.


xserver-1.6.0-preferred-thinko.patch:

--- NEW FILE xserver-1.6.0-preferred-thinko.patch ---
>From 33c791b421db742e78c74028a5ef5f6604e66c48 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Mon, 2 Mar 2009 13:00:31 -0500
Subject: [PATCH] Fix output setup when only one head, and it's not the zeroth one.

---
 hw/xfree86/modes/xf86Crtc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index a8fd099..ad6ca98 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -2070,9 +2070,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
 		     (float)config->output[p]->mm_height;
 
 	if (aspect)
-	    preferred_match[0] = bestModeForAspect(config, enabled, aspect);
+	    preferred_match[p] = bestModeForAspect(config, enabled, aspect);
 
-	if (preferred_match[0])
+	if (preferred_match[p])
 	    ret = TRUE;
 
     } while (0);
-- 
1.6.1.3



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- xorg-x11-server.spec	27 Feb 2009 00:42:40 -0000	1.414
+++ xorg-x11-server.spec	2 Mar 2009 17:59:04 -0000	1.415
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -94,6 +94,7 @@
 # from master, may end up in 1.6.1.
 Patch6018: xserver-1.6.0-XIPropToInt.patch
 Patch6019: xserver-1.6.0-XATOM_FLOAT.patch
+Patch6020: xserver-1.6.0-preferred-thinko.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -511,6 +512,10 @@
 
 
 %changelog
+* Mon Mar 02 2009 Adam Jackson <ajax at redhat.com> 1.6.0-3
+- xserver-1.6.0-preferred-thinko.patch: Fix a thinko in output setup when
+  only one head is attached.
+
 * Fri Feb 27 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.0-2
 - xserver-1.6.0-XIPropToInt.patch: add XIPropToInt helper function
   (requirement for XATOM_FLOAT patch)