Hello community, here is the log from the commit of package xorg-x11-server checked in at Wed Oct 10 00:22:46 CEST 2007. -------- --- xorg-x11-server/xorg-x11-server.changes 2007-10-04 12:52:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2007-10-09 19:11:32.300041000 +0200 @@ -1,0 +2,6 @@ +Tue Oct 9 19:07:57 CEST 2007 - sndirsch@suse.de + +- preferred_mode-fix.diff + * more reasonable patch (Bug #329724) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.e23565/_old 2007-10-10 00:22:21.000000000 +0200 +++ /var/tmp/diff_new_pack.e23565/_new 2007-10-10 00:22:21.000000000 +0200 @@ -21,7 +21,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.3 -Release: 4 +Release: 7 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -198,7 +198,7 @@ %patch79 -p1 %patch80 %patch81 -p1 -%patch82 -p0 +%patch82 -p1 %build pushd xorg-docs-* @@ -529,6 +529,9 @@ /usr/bin/Xvnc %endif %changelog +* Tue Oct 09 2007 - sndirsch@suse.de +- preferred_mode-fix.diff + * more reasonable patch (Bug #329724) * Thu Oct 04 2007 - sndirsch@suse.de - preferred_mode-fix.diff * fixed endless loop if PreferredMode is set (Bug #329724) ++++++ preferred_mode-fix.diff ++++++ --- /var/tmp/diff_new_pack.e23565/_old 2007-10-10 00:22:23.000000000 +0200 +++ /var/tmp/diff_new_pack.e23565/_new 2007-10-10 00:22:23.000000000 +0200 @@ -1,10 +1,22 @@ ---- hw/xfree86/modes/xf86Crtc.c.orig 2007-10-04 12:45:33.070367500 +0200 -+++ hw/xfree86/modes/xf86Crtc.c 2007-10-04 12:49:45.850165250 +0200 -@@ -1416,6 +1416,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, +--- xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c.deadloop 2007-10-01 11:46:05.000000000 +0200 ++++ xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c 2007-10-01 11:53:35.000000000 +0200 +@@ -1415,9 +1415,10 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, + + if (preferred_mode) + { ++ int found = 0; + for (mode = output->probed_modes; mode; mode = mode->next) + { +- if (!strcmp (preferred_mode, mode->name)) ++ if (!found && !strcmp (preferred_mode, mode->name)) + { + if (mode != output->probed_modes) + { +@@ -1431,6 +1432,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, output->probed_modes = mode; } mode->type |= M_T_PREFERRED; -+ break; ++ found = 1; } else mode->type &= ~M_T_PREFERRED; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de