diff --git a/xorg-x11-server-Red-Hat-extramodes.patch b/xorg-x11-server-Red-Hat-extramodes.patch index 9b2a1a0..057368e 100644 --- a/xorg-x11-server-Red-Hat-extramodes.patch +++ b/xorg-x11-server-Red-Hat-extramodes.patch @@ -1,34 +1,17 @@ ---- xorg-server-1.0.1/hw/xfree86/common/extramodes.Red-Hat-extramodes 2004-04-23 15:53:57.000000000 -0400 -+++ xorg-server-1.0.1/hw/xfree86/common/extramodes 2006-03-06 15:09:19.000000000 -0500 -@@ -10,14 +10,23 @@ - # 1152x768 @ 54.8Hz (Titanium PowerBook) hsync: 44.2kHz - ModeLine "1152x768" 64.995 1152 1178 1314 1472 768 771 777 806 +hsync +vsync +Please keep the modes in the extramodes file sorted by the X resolution, then +by the Y resolution for readability and ease of maintenance. + +--- 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 $ + // ++// NOTE: Please keep all video modes sorted in order of X res, then Y res for ++// ease of maintenance and readability. -+# 1152x864 @ 85Hz (Red Hat custom modeline) -+ModeLine "1152x864" 121.5 1152 1216 1344 1568 864 865 868 911 +hsync -vsync -+ - # 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz - ModeLine "1400x1050" 122.0 1400 1488 1640 1880 1050 1052 1064 1082 +hsync +vsync - -+# 1400x1050 @ 70Hz (Red Hat custom modeline) hsync: 76.8kHz -+ModeLine "1400x1050" 151.0 1400 1464 1656 1960 1050 1051 1054 1100 +hsync +vsync -+ - # 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz - ModeLine "1400x1050" 155.8 1400 1464 1784 1912 1050 1052 1064 1090 +hsync +vsync - --# 1600x1024 @ 60Hz (SGI 1600SW) hsync: 64.0kHz --Modeline "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -hsync -vsync -+# 1400x1050 @ 85Hz (Red Hat custom modeline) hsync: 93.2 kHz -+ModeLine "1400x1050" 184.0 1400 1464 1656 1960 1050 1051 1054 1100 +hsync +vsync -+ -+# 1920x1200 @ 70Hz (Red Hat custom modeline - bugzilla #53364) hsync: 87.50 KHz -+Modeline "1920x1200" 230.0 1920 1936 2096 2528 1200 1201 1204 1250 -HSync -VSync - - # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz - Modeline "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync -@@ -31,3 +40,114 @@ - # 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz - Modeline "2048x1536" 388.04 2048 2216 2440 2832 1536 1537 1540 1612 -hsync +vsync + # 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 +# 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 @@ -42,6 +25,9 @@ +# 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 + + # 1152x768 @ 54.8Hz (Titanium PowerBook) hsync: 44.2kHz + ModeLine "1152x768" 64.995 1152 1178 1314 1472 768 771 777 806 +hsync +vsync + +# 1152x864 @ 60.00 Hz (GTF) hsync: 53.70 kHz; pclk: 81.62 MHz +Modeline "1152x864" 81.62 1152 1216 1336 1520 864 865 868 895 -HSync +Vsync + @@ -54,42 +40,12 @@ +# 1152x864 @ 85.00 Hz (GTF) hsync: 77.10 kHz; pclk: 119.65 MHz +Modeline "1152x864" 119.65 1152 1224 1352 1552 864 865 868 907 -HSync +Vsync + ++# 1152x864 @ 85Hz (Red Hat custom modeline) ++ModeLine "1152x864" 121.5 1152 1216 1344 1568 864 865 868 911 +hsync -vsync ++ +# 1152x864 @ 100.00 Hz (GTF) hsync: 91.50 kHz; pclk: 143.47 MHz +Modeline "1152x864" 143.47 1152 1232 1360 1568 864 865 868 915 -HSync +Vsync + -+# 1400x1050 @ 70.00 Hz (GTF) hsync: 76.51 kHz; pclk: 145.06 MHz -+Modeline "1400x1050" 145.06 1400 1496 1648 1896 1050 1051 1054 1093 -HSync +Vsync -+ -+# 1400x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 179.26 MHz -+Modeline "1400x1050" 179.26 1400 1504 1656 1912 1050 1051 1054 1103 -HSync +Vsync -+ -+# 1440x900 @ 60.00 Hz (CVT) -+# field rate 59.89 Hz; hsync: 55.93 kHz; pclk: 106.50 MHz -+Modeline "1440x900" 106.50 1440 1520 1672 1904 900 903 909 934 -HSync +Vsync -+ -+# 1280x800 @ 60.00 Hz (GTF) hsync: 49.68 kHz; pclk: 83.46 MHz -+Modeline "1280x800" 83.46 1280 1344 1480 1680 800 801 804 828 -HSync +Vsync -+ -+# 1280x800 @ 70.00 Hz (GTF) hsync: 58.31 kHz; pclk: 98.89 MHz -+Modeline "1280x800" 98.89 1280 1352 1488 1696 800 801 804 833 -HSync +Vsync -+ -+# 1280x800 @ 75.00 Hz (GTF) hsync: 62.62 kHz; pclk: 107.21 MHz -+Modeline "1280x800" 107.21 1280 1360 1496 1712 800 801 804 835 -HSync +Vsync -+ -+# 1280x800 @ 85.00 Hz (GTF) hsync: 71.40 kHz; pclk: 123.38 MHz -+Modeline "1280x800" 123.38 1280 1368 1504 1728 800 801 804 840 -HSync +Vsync -+ -+# 1680x1050 59.95 Hz (CVT 1.76MA) hsync: 65.29 kHz; pclk: 146.25 MHz -+Modeline "1680x1050" 146.25 1680 1784 1960 2240 1050 1053 1059 1089 -hsync +vsync -+ -+# 1680x1050 69.88 Hz (CVT) hsync: 76.58 kHz; pclk: 174.00 MHz -+Modeline "1680x1050" 174.00 1680 1800 1976 2272 1050 1053 1059 1096 -hsync +vsync -+ -+# 1680x1050 74.89 Hz (CVT 1.76MA) hsync: 82.31 kHz; pclk: 187.00 MHz -+Modeline "1680x1050" 187.00 1680 1800 1976 2272 1050 1053 1059 1099 -hsync +vsync -+# 1680x1050 84.94 Hz (CVT 1.76MA) hsync: 93.86 kHz; pclk: 214.75 MHz -+Modeline "1680x1050" 214.75 1680 1808 1984 2288 1050 1053 1059 1105 -hsync +vsync -+ +# 1280x720 @ 60.00 Hz (GTF) hsync: 44.76 kHz; pclk: 74.48 MHz +Modeline "1280x720" 74.48 1280 1336 1472 1664 720 721 724 746 -HSync +Vsync + @@ -102,6 +58,18 @@ +# 1280x720 @ 85.00 Hz (GTF) hsync: 64.26 kHz; pclk: 110.01 MHz +Modeline "1280x720" 110.01 1280 1360 1496 1712 720 721 724 756 -HSync +Vsync + ++# 1280x800 @ 60.00 Hz (GTF) hsync: 49.68 kHz; pclk: 83.46 MHz ++Modeline "1280x800" 83.46 1280 1344 1480 1680 800 801 804 828 -HSync +Vsync ++ ++# 1280x800 @ 70.00 Hz (GTF) hsync: 58.31 kHz; pclk: 98.89 MHz ++Modeline "1280x800" 98.89 1280 1352 1488 1696 800 801 804 833 -HSync +Vsync ++ ++# 1280x800 @ 75.00 Hz (GTF) hsync: 62.62 kHz; pclk: 107.21 MHz ++Modeline "1280x800" 107.21 1280 1360 1496 1712 800 801 804 835 -HSync +Vsync ++ ++# 1280x800 @ 85.00 Hz (GTF) hsync: 71.40 kHz; pclk: 123.38 MHz ++Modeline "1280x800" 123.38 1280 1368 1504 1728 800 801 804 840 -HSync +Vsync ++ +# 1280x768 @ 60.00 Hz (GTF) hsync: 47.70 kHz; pclk: 80.14 MHz +Modeline "1280x768" 80.14 1280 1344 1480 1680 768 769 772 795 -HSync +Vsync + @@ -113,6 +81,56 @@ + +# 1280x768 @ 85.00 Hz (GTF) hsync: 68.60 kHz; pclk: 118.53 MHz +Modeline "1280x768" 118.53 1280 1368 1504 1728 768 769 772 807 -HSync +Vsync ++ + # 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz + ModeLine "1400x1050" 122.0 1400 1488 1640 1880 1050 1052 1064 1082 +hsync +vsync + ++# 1400x1050 @ 70.00 Hz (GTF) hsync: 76.51 kHz; pclk: 145.06 MHz ++Modeline "1400x1050" 145.06 1400 1496 1648 1896 1050 1051 1054 1093 -HSync +Vsync ++ ++# 1400x1050 @ 70Hz (Red Hat custom modeline) hsync: 76.8kHz ++ModeLine "1400x1050" 151.0 1400 1464 1656 1960 1050 1051 1054 1100 +hsync +vsync ++ + # 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz + ModeLine "1400x1050" 155.8 1400 1464 1784 1912 1050 1052 1064 1090 +hsync +vsync + +-# 1600x1024 @ 60Hz (SGI 1600SW) hsync: 64.0kHz +-Modeline "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -hsync -vsync ++# 1400x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 179.26 MHz ++Modeline "1400x1050" 179.26 1400 1504 1656 1912 1050 1051 1054 1103 -HSync +Vsync ++ ++# 1400x1050 @ 85Hz (Red Hat custom modeline) hsync: 93.2 kHz ++ModeLine "1400x1050" 184.0 1400 1464 1656 1960 1050 1051 1054 1100 +hsync +vsync ++ ++# 1440x900 @ 60.00 Hz (CVT) field rate 59.89 Hz; hsync: 55.93 kHz; pclk: 106.50 MHz ++Modeline "1440x900" 106.50 1440 1520 1672 1904 900 903 909 934 -HSync +Vsync ++ ++# 1600x1024 for SGI 1600 SW ++ModeLine "1600x1024" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 +Hsync +Vsync ++ ++# 1680x1050 59.95 Hz (CVT 1.76MA) hsync: 65.29 kHz; pclk: 146.25 MHz ++Modeline "1680x1050" 146.25 1680 1784 1960 2240 1050 1053 1059 1089 -hsync +vsync ++ ++# 1680x1050 69.88 Hz (CVT) hsync: 76.58 kHz; pclk: 174.00 MHz ++Modeline "1680x1050" 174.00 1680 1800 1976 2272 1050 1053 1059 1096 -hsync +vsync ++ ++# 1680x1050 74.89 Hz (CVT 1.76MA) hsync: 82.31 kHz; pclk: 187.00 MHz ++Modeline "1680x1050" 187.00 1680 1800 1976 2272 1050 1053 1059 1099 -hsync +vsync ++ ++# 1680x1050 84.94 Hz (CVT 1.76MA) hsync: 93.86 kHz; pclk: 214.75 MHz ++Modeline "1680x1050" 214.75 1680 1808 1984 2288 1050 1053 1059 1105 -hsync +vsync ++ ++# 1920x1080 59.96 Hz (CVT 2.07M9) hsync: 67.16 kHz; pclk: 173.00 MHz ++Modeline "1920x1080" 173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync ++ ++# 1920x1080 69.92 Hz (CVT) hsync: 78.80 kHz; pclk: 204.25 MHz ++Modeline "1920x1080" 204.25 1920 2056 2256 2592 1080 1083 1088 1127 -hsync +vsync ++ ++# 1920x1080 74.91 Hz (CVT 2.07M9) hsync: 84.64 kHz; pclk: 220.75 MHz ++Modeline "1920x1080" 220.75 1920 2064 2264 2608 1080 1083 1088 1130 -hsync +vsync ++ ++# 1920x1080 84.88 Hz (CVT 2.07M9) hsync: 96.51 kHz; pclk: 253.25 MHz ++Modeline "1920x1080" 253.25 1920 2064 2272 2624 1080 1083 1088 1137 -hsync +vsync + +# 1920x1200 @ 60.00 Hz (GTF) hsync: 74.52 kHz; pclk: 193.16 MHz +Modeline "1920x1200" 193.16 1920 2048 2256 2592 1200 1201 1204 1242 -HSync +Vsync @@ -120,12 +138,21 @@ +# 1920x1200 @ 70.00 Hz (GTF) hsync: 87.43 kHz; pclk: 228.02 MHz +Modeline "1920x1200" 228.02 1920 2056 2264 2608 1200 1201 1204 1249 -HSync +Vsync + ++# 1920x1200 @ 70Hz (Red Hat custom modeline - bugzilla #53364) hsync: 87.50 KHz ++Modeline "1920x1200" 230.0 1920 1936 2096 2528 1200 1201 1204 1250 -HSync -VSync ++ +# 1920x1200 @ 75.00 Hz (GTF) hsync: 93.97 kHz; pclk: 246.59 MHz +Modeline "1920x1200" 246.59 1920 2064 2272 2624 1200 1201 1204 1253 -HSync +Vsync + +# 1920x1200 @ 85.00 Hz (GTF) hsync: 107.10 kHz; pclk: 282.74 MHz +Modeline "1920x1200" 282.74 1920 2072 2280 2640 1200 1201 1204 1260 -HSync +Vsync -+ + + # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz + Modeline "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync +@@ -31,3 +153,14 @@ + # 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz + Modeline "2048x1536" 388.04 2048 2216 2440 2832 1536 1537 1540 1612 -hsync +vsync + +# 2560x1600 @ 60.00 Hz (GTF) hsync: 99.36 kHz; pclk: 348.16 MHz +Modeline "2560x1600" 348.16 2560 2752 3032 3504 1600 1601 1604 1656 -HSync +Vsync + @@ -137,7 +164,3 @@ + +# 2560x1600 @ 85.00 Hz (GTF) hsync: 142.80 kHz; pclk: 507.23 MHz +Modeline "2560x1600" 507.23 2560 2768 3056 3552 1600 1601 1604 1680 -HSync +Vsync -+ -+# 1600x1024 for SGI 1600 SW -+ModeLine "1600x1024" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 +Hsync +Vsync -+ diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 51ba86f..63c0a1d 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -8,7 +8,7 @@ Version: 1.1.1 # upgrades to officially released distribution releases, if the package # Version field above is not changing, append and/or bump a digit /after/ # the dist tag. ie: 25%{dist}.0 -> 25%{dist}.1 ... -Release: 11%{?dist} +Release: 12%{?dist} URL: http://www.x.org License: MIT/X11 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 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die -%patch1001 -p1 -b .Red-Hat-extramodes +%patch1001 -p0 -b .Red-Hat-extramodes %patch1002 -p1 -b .xephyr %patch1003 -p1 -b .fpic %patch1004 -p1 -b .selinux-awareness @@ -672,6 +672,10 @@ rm -rf $RPM_BUILD_ROOT # ------------------------------------------------------------------- %changelog +* Wed Jul 26 2006 Mike A. Harris 1.1.1-12.fc6 +- 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. + * Tue Jul 25 2006 Adam Jackson 1.1.1-11.fc6 - Add selinux{,-devel} buildreqs.