rpms/xorg-x11-server/devel xserver-1.3.0-randr-preferred-mode-fix.patch, NONE, 1.1 xorg-x11-server.spec, 1.254, 1.255

[Adam Jackson (ajax) <fedora-extras-commits redhat com>]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28957

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.3.0-randr-preferred-mode-fix.patch 
Log Message:
* Fri Oct 05 2007 Adam Jackson <ajax redhat com> 1.3.0.0-29
- xserver-1.3.0-randr-preferred-mode-fix.patch: Fix infinite loop on X
  startup when a mode is requested in the config file. (#318731)
- Fix License tag.


xserver-1.3.0-randr-preferred-mode-fix.patch:

--- NEW FILE xserver-1.3.0-randr-preferred-mode-fix.patch ---
diff -up xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c.jx xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c
--- xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c.jx	2007-10-03 13:10:28.000000000 -0400
+++ xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c	2007-10-05 09:58:11.000000000 -0400
@@ -1420,6 +1420,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, 
 	    {
 		if (!strcmp (preferred_mode, mode->name))
 		{
+		    DisplayModePtr m;
+
+		    /* Sort it to the front of the list */
 		    if (mode != output->probed_modes)
 		    {
 			if (mode->prev)
@@ -1431,10 +1434,17 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, 
 			mode->prev = NULL;
 			output->probed_modes = mode;
 		    }
+
+		    /* Mark it preferred */
 		    mode->type |= M_T_PREFERRED;
+
+		    /* And unprefer everything else */
+		    for (m = output->probed_modes; m; m = m->next)
+			if (m != mode)
+			    m->type &= ~M_T_PREFERRED;
+
+		    break;
 		}
-		else
-		    mode->type &= ~M_T_PREFERRED;
 	    }
 	}
 	


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- xorg-x11-server.spec	3 Oct 2007 15:30:59 -0000	1.254
+++ xorg-x11-server.spec	5 Oct 2007 16:17:44 -0000	1.255
@@ -9,9 +9,9 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   28%{?dist}
+Release:   29%{?dist}
 URL:       http://www.x.org
-License:   MIT/X11
+License:   MIT
 Group:     User Interface/X
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -59,6 +59,7 @@
 Patch1014:  xserver-1.3.0-newglx-offscreen-pixmaps.patch
 Patch1015:  xserver-1.3.0-randr-updates.patch
 Patch1022:  xserver-1.3.0-default-dpi.patch
+Patch1023:  xserver-1.3.0-randr-preferred-mode-fix.patch
 
 Patch2001:  xserver-1.2.0-geode-mmx.patch
 Patch2002:  xserver-1.2.0-xephyr-keysym-madness.patch
@@ -320,6 +321,7 @@
 %patch1014 -p1 -b .offscreen-pixmaps
 %patch1015 -p1 -b .randr-update
 %patch1022 -p1 -b .dpi
+%patch1023 -p1 -b .randr-preferred
 
 %patch2001 -p1 -b .geode-mmx
 %patch2002 -p1 -b .xephyr-keysym
@@ -608,6 +610,11 @@
 
 
 %changelog
+* Fri Oct 05 2007 Adam Jackson <ajax redhat com> 1.3.0.0-29
+- xserver-1.3.0-randr-preferred-mode-fix.patch: Fix infinite loop on X
+  startup when a mode is requested in the config file. (#318731)
+- Fix License tag.
+
 * Wed Oct 03 2007 Adam Jackson <ajax redhat com> 1.3.0.0-28
 - xserver-1.3.0-accidental-abi.patch: Make sure some symbols from parser/
   get exported, since apparently the intel driver uses them despite their