rpms/xorg-x11-server
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Fri Oct 05 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-29

Browse Source 
- 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.
This commit is contained in:
Adam Jackson 2007-10-05 16:17:44 +00:00
parent 5f326a33d6
commit a133a7b192
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xorg-x11-server.spec
View File

@ -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 @@ Patch1013: xserver-1.3.0-exaupgrade.patch
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 @@ Xserver source code needed to build VNC server (Xvnc)
%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 @@ rm -rf $RPM_BUILD_ROOT
%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

33
xserver-1.3.0-randr-preferred-mode-fix.patch Normal file
View File

@ -0,0 +1,33 @@
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;
}
}