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

* Mon Mar 02 2009 Adam Jackson <ajax@redhat.com> 1.6.0-3

Browse Source 
- xserver-1.6.0-preferred-thinko.patch: Fix a thinko in output setup when
  only one head is attached.
This commit is contained in:
Adam Jackson 2009-03-02 17:59:04 +00:00
parent 6b868c81bb
commit db3493e3e9
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xorg-x11-server.spec
View File

@ -19,7 +19,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.6.0 Version: 1.6.0
Release: 2%{?dist} Release: 3%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -94,6 +94,7 @@ Patch6017: xserver-1.5.99.902-nouveau.patch
# from master, may end up in 1.6.1. # from master, may end up in 1.6.1.
Patch6018: xserver-1.6.0-XIPropToInt.patch Patch6018: xserver-1.6.0-XIPropToInt.patch
Patch6019: xserver-1.6.0-XATOM_FLOAT.patch Patch6019: xserver-1.6.0-XATOM_FLOAT.patch
Patch6020: xserver-1.6.0-preferred-thinko.patch
%define moduledir %{_libdir}/xorg/modules %define moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri %define drimoduledir %{_libdir}/dri
@ -511,6 +512,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Mar 02 2009 Adam Jackson <ajax@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@redhat.com> 1.6.0-2 * Fri Feb 27 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.0-2
- xserver-1.6.0-XIPropToInt.patch: add XIPropToInt helper function - xserver-1.6.0-XIPropToInt.patch: add XIPropToInt helper function
(requirement for XATOM_FLOAT patch) (requirement for XATOM_FLOAT patch)

28
xserver-1.6.0-preferred-thinko.patch Normal file
View File

@ -0,0 +1,28 @@
From 33c791b421db742e78c74028a5ef5f6604e66c48 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@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