rpms/xorg-x11-server/devel xorg-x11-server-1.1.0-no-zlib.patch, NONE, 1.1 xorg-x11-server-1.0.1-Red-Hat-extramodes.patch, 1.2, 1.3 xorg-x11-server.spec, 1.103, 1.104

Tue Jun 27 22:15:18 UTC 2006

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16242

Modified Files:
	xorg-x11-server-1.0.1-Red-Hat-extramodes.patch 
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.0-no-zlib.patch 
Log Message:
- Don't (uselessly) link the server against zlib.
- Fix the 1680x1050 modes to be the CVT timings instead of GTF.


xorg-x11-server-1.1.0-no-zlib.patch:
 configure.ac |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xorg-x11-server-1.1.0-no-zlib.patch ---
--- xorg-server-1.1.0/configure.ac.zlib	2006-06-22 12:30:28.000000000 -0400
+++ xorg-server-1.1.0/configure.ac	2006-06-22 12:31:44.000000000 -0400
@@ -856,7 +856,7 @@
 PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
 
 XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS}"
-XSERVER_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} -lm -lz"
+XSERVER_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} -lm"
 AC_SUBST([XSERVER_LIBS])
 AC_SUBST([SYS_LIBS])
 

xorg-x11-server-1.0.1-Red-Hat-extramodes.patch:
 extramodes |  117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 115 insertions(+), 2 deletions(-)

Index: xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.0.1-Red-Hat-extramodes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-server-1.0.1-Red-Hat-extramodes.patch	6 Mar 2006 20:38:28 -0000	1.2
+++ xorg-x11-server-1.0.1-Red-Hat-extramodes.patch	27 Jun 2006 22:15:12 -0000	1.3
@@ -26,7 +26,7 @@
  
  # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz
  Modeline "1920x1440" 341.35  1920 2072 2288 2656  1440 1441 1444 1512 -hsync +vsync
-@@ -31,3 +40,108 @@
+@@ -31,3 +40,107 @@
  # 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz
  Modeline "2048x1536" 388.04  2048 2216 2440 2832  1536 1537 1540 1612 -hsync +vsync
  
@@ -72,17 +72,16 @@
 +# 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 @ 60.00 Hz (GTF) hsync: 65.22 kHz; pclk: 147.14 MHz
-+Modeline "1680x1050"  147.14  1680 1784 1968 2256  1050 1051 1054 1087  -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 @ 70.00 Hz (GTF) hsync: 76.51 kHz; pclk: 173.83 MHz
-+Modeline "1680x1050"  173.83  1680 1792 1976 2272  1050 1051 1054 1093  -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 @ 75.00 Hz (GTF) hsync: 82.20 kHz; pclk: 188.07 MHz
-+Modeline "1680x1050"  188.07  1680 1800 1984 2288  1050 1051 1054 1096  -HSync +Vsync
-+
-+# 1680x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 214.51 MHz
-+Modeline "1680x1050"  214.51  1680 1800 1984 2288  1050 1051 1054 1103  -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


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- xorg-x11-server.spec	26 Jun 2006 23:24:37 -0000	1.103
+++ xorg-x11-server.spec	27 Jun 2006 22:15:13 -0000	1.104
@@ -41,6 +41,7 @@
 Patch2001:  xorg-x11-server-1.1.0-pci-scan-fixes.patch
 Patch2002:  xorg-x11-server-1.1.0-hush-crash-message.patch
 #Patch2003:  xorg-x11-server-1.1.0-loader-diet.patch
+Patch2004:  xorg-x11-server-1.1.0-no-zlib.patch
 
 # autoconfiguration feature patches
 #Patch3000:  xorg-x11-server-1.1.0-input-autoconfig-2.patch
@@ -311,6 +312,7 @@
 %patch2001 -p1 -b .pci-scan
 %patch2002 -p1 -b .crash-message
 #%patch2003 -p1 -b .loader-diet
+%patch2004 -p1 -b .zlib
 
 %patch3001 -p1 -b .edid1
 %patch3002 -p1 -b .edid2
@@ -642,6 +644,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Tue Jun 27 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-24
+- Don't (uselessly) link the server against zlib.
+- Fix the 1680x1050 modes to be the CVT timings instead of GTF.
+
 * Mon Jun 26 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-23
 - Fix an open-coded check for reduced-blanking modes to only apply to analog
   connectors.


