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

* Fri Jul 28 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-13.fc6

Browse Source 
- Comment out the 848x480 modes from the extramodes patch.  Any panel that
  wants it should be doing EDID injection by now, and it screws up
  autoconfig by _just_ fitting in the ranges for 800x600.
This commit is contained in:
Adam Jackson 2006-07-28 19:26:46 +00:00
parent d9aa1ba3a2
commit 34d1ce8679
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
xorg-x11-server-Red-Hat-extramodes.patch
View File

@ -1,9 +1,6 @@
Please keep the modes in the extramodes file sorted by the X resolution, then --- xorg-server-1.1.1/hw/xfree86/common/extramodes.Red-Hat-extramodes 2006-07-05 14:31:40.000000000 -0400
by the Y resolution for readability and ease of maintenance. +++ xorg-server-1.1.1/hw/xfree86/common/extramodes 2006-07-28 15:06:01.000000000 -0400
@@ -3,21 +3,147 @@
--- hw/xfree86/common/extramodes.Red-Hat-extramodes 2006-07-05 14:31:40.000000000 -0400
+++ hw/xfree86/common/extramodes 2006-07-26 07:52:01.000000000 -0400
@@ -3,21 +3,143 @@
// //
// $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $ // $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $
// //
@ -13,17 +10,21 @@ by the Y resolution for readability and ease of maintenance.
# 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz # 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz
ModeLine "832x624" 57.284 832 864 928 1152 624 625 628 667 -Hsync -Vsync ModeLine "832x624" 57.284 832 864 928 1152 624 625 628 667 -Hsync -Vsync
+# Disable the 848x480 modes for now. They're quite rare, and they screw up
+# the autosizing logic. They're panel modes anyway, and EDID injection
+# should cover that now. - ajax, 2006-07-28
+
+# 848x480 @ 60.00 Hz (GTF) hsync: 29.82 kHz; pclk: 31.49 MHz +# 848x480 @ 60.00 Hz (GTF) hsync: 29.82 kHz; pclk: 31.49 MHz
+Modeline "848x480" 31.49 848 864 952 1056 480 481 484 497 -HSync +Vsync +# Modeline "848x480" 31.49 848 864 952 1056 480 481 484 497 -HSync +Vsync
+ +
+# 848x480 @ 70.00 Hz (GTF) hsync: 35.00 kHz; pclk: 37.52 MHz +# 848x480 @ 70.00 Hz (GTF) hsync: 35.00 kHz; pclk: 37.52 MHz
+Modeline "848x480" 37.52 848 872 960 1072 480 481 484 500 -HSync +Vsync +# Modeline "848x480" 37.52 848 872 960 1072 480 481 484 500 -HSync +Vsync
+ +
+# 848x480 @ 75.00 Hz (GTF) hsync: 37.65 kHz; pclk: 40.96 MHz +# 848x480 @ 75.00 Hz (GTF) hsync: 37.65 kHz; pclk: 40.96 MHz
+Modeline "848x480" 40.96 848 880 968 1088 480 481 484 502 -HSync +Vsync +# Modeline "848x480" 40.96 848 880 968 1088 480 481 484 502 -HSync +Vsync
+ +
+# 848x480 @ 85.00 Hz (GTF) hsync: 42.92 kHz; pclk: 47.39 MHz +# 848x480 @ 85.00 Hz (GTF) hsync: 42.92 kHz; pclk: 47.39 MHz
+Modeline "848x480" 47.39 848 888 976 1104 480 481 484 505 -HSync +Vsync +# Modeline "848x480" 47.39 848 888 976 1104 480 481 484 505 -HSync +Vsync
+ +
# 1152x768 @ 54.8Hz (Titanium PowerBook) hsync: 44.2kHz # 1152x768 @ 54.8Hz (Titanium PowerBook) hsync: 44.2kHz
ModeLine "1152x768" 64.995 1152 1178 1314 1472 768 771 777 806 +hsync +vsync ModeLine "1152x768" 64.995 1152 1178 1314 1472 768 771 777 806 +hsync +vsync
@ -149,7 +150,7 @@ by the Y resolution for readability and ease of maintenance.
# 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz
Modeline "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync Modeline "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync
@@ -31,3 +153,14 @@ @@ -31,3 +157,14 @@
# 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz # 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz
Modeline "2048x1536" 388.04 2048 2216 2440 2832 1536 1537 1540 1612 -hsync +vsync Modeline "2048x1536" 388.04 2048 2216 2440 2832 1536 1537 1540 1612 -hsync +vsync

9
xorg-x11-server.spec
View File

@ -8,7 +8,7 @@ Version: 1.1.1
# upgrades to officially released distribution releases, if the package # upgrades to officially released distribution releases, if the package
# Version field above is not changing, append and/or bump a digit /after/ # Version field above is not changing, append and/or bump a digit /after/
# the dist tag. ie: 25%{dist}.0 -> 25%{dist}.1 ... # the dist tag. ie: 25%{dist}.0 -> 25%{dist}.1 ...
Release: 12%{?dist} Release: 13%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT/X11 License: MIT/X11
Group: User Interface/X Group: User Interface/X
@ -326,7 +326,7 @@ drivers, input drivers, or other X modules should install this package.
%patch106 -p1 -b .no-xnest-composite %patch106 -p1 -b .no-xnest-composite
%patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
%patch1001 -p0 -b .Red-Hat-extramodes %patch1001 -p1 -b .Red-Hat-extramodes
%patch1002 -p1 -b .xephyr %patch1002 -p1 -b .xephyr
%patch1003 -p1 -b .fpic %patch1003 -p1 -b .fpic
%patch1004 -p1 -b .selinux-awareness %patch1004 -p1 -b .selinux-awareness
@ -672,6 +672,11 @@ rm -rf $RPM_BUILD_ROOT
# ------------------------------------------------------------------- # -------------------------------------------------------------------
%changelog %changelog
* Fri Jul 28 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-13.fc6
- Comment out the 848x480 modes from the extramodes patch. Any panel that
wants it should be doing EDID injection by now, and it screws up
autoconfig by _just_ fitting in the ranges for 800x600.
* Wed Jul 26 2006 Mike A. Harris <mharris@redhat.com> 1.1.1-12.fc6 * Wed Jul 26 2006 Mike A. Harris <mharris@redhat.com> 1.1.1-12.fc6
- Added "1920x1080" CVT modes to Red-Hat-extramodes patch for (#195272) - Added "1920x1080" CVT modes to Red-Hat-extramodes patch for (#195272)
- Sorted the extramodes file by X res, then Y res for ease of maintenance. - Sorted the extramodes file by X res, then Y res for ease of maintenance.