Author: justin
Date: 2006-05-09 22:51:41 -0600 (Tue, 09 May 2006)
New Revision: 1546
Added:
branches/6.1.1/packages/Xorg/xorg-6.8.2-dotclock-1.patch
Modified:
branches/6.1.1/packages/Xorg/Makefile
Log:
Backported dotclock patch from LiveCD trunk to 6.1.1 branch, to match with
README and .xinitrc changes.
Modified: branches/6.1.1/packages/Xorg/Makefile
===================================================================
--- branches/6.1.1/packages/Xorg/Makefile 2006-05-10 04:04:04 UTC (rev
1545)
+++ branches/6.1.1/packages/Xorg/Makefile 2006-05-10 04:51:41 UTC (rev
1546)
@@ -22,6 +22,8 @@
PATCH4= 991_ubuntu_gcc_flags.diff
+PATCH5= xorg-6.8.2-dotclock-1.patch
+
# Targets
include $(ROOT)/scripts/functions
@@ -38,6 +40,7 @@
patch -Np1 -i ../$(PATCH2)
patch -Np1 -i ../$(PATCH3)
patch -Np1 -i ../$(PATCH4)
+ patch -Np1 -i ../$(PATCH5)
sed -i '/^SUBDIRS =/s/s etc$$//' programs/Xserver/Xprint/Imakefile
pushd config/util ; \
make -f Makefile.ini lndir ; \
Added: branches/6.1.1/packages/Xorg/xorg-6.8.2-dotclock-1.patch
===================================================================
--- branches/6.1.1/packages/Xorg/xorg-6.8.2-dotclock-1.patch
(rev 0)
+++ branches/6.1.1/packages/Xorg/xorg-6.8.2-dotclock-1.patch 2006-05-10
04:51:41 UTC (rev 1546)
@@ -0,0 +1,61 @@
+Submitted By: Alexander E. Patrakov
+Date: 2006-02-28
+Initial Package Version: 7.0.0
+Origin: Alexander E. Patrakov
+Upstream status: LiveCD specific
+Description: Makes it an error to exceed the DDC probed maximum dot clock.
+Deletes default modes with refresh rate less than 60 Hz.
+
+Should fix "I get [EMAIL PROTECTED] instead of nice [EMAIL PROTECTED]" and
+"my LCD monitor gets confused" problems with unconfigured (i.e.,
+no "Modes" line) Xorg.
+
+Backported to Xorg-6.8.2 on 20060509 by Justin Knierim.
+
+diff -Naur xc.orig/programs/Xserver/hw/xfree86/common/xf86Mode.c
xc/programs/Xserver/hw/xfree86/common/xf86Mode.c
+--- xc.orig/programs/Xserver/hw/xfree86/common/xf86Mode.c 2004-04-23
12:20:32.000000000 -0700
++++ xc/programs/Xserver/hw/xfree86/common/xf86Mode.c 2006-05-09
21:39:22.000000000 -0700
+@@ -736,6 +736,7 @@
+ "(%s,%s) mode clock %gMHz exceeds DDC maximum %dMHz\n",
+ mode->name, monitor->id,
+ mode->Clock/1000.0, mon_range->max_clock);
++ return MODE_CLOCK_HIGH;
+ }
+ }
+ }
+diff -Naur xc.orig/programs/Xserver/hw/xfree86/etc/extramodes
xc/programs/Xserver/hw/xfree86/etc/extramodes
+--- xc.orig/programs/Xserver/hw/xfree86/etc/extramodes 2004-04-23
12:53:57.000000000 -0700
++++ xc/programs/Xserver/hw/xfree86/etc/extramodes 2006-05-09
21:40:09.000000000 -0700
+@@ -7,9 +7,6 @@
+ # 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
+
+-# 1152x768 @ 54.8Hz (Titanium PowerBook) hsync: 44.2kHz
+-ModeLine "1152x768" 64.995 1152 1178 1314 1472 768 771 777 806 +hsync
+vsync
+-
+ # 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz
+ ModeLine "1400x1050" 122.0 1400 1488 1640 1880 1050 1052 1064 1082 +hsync
+vsync
+
+diff -Naur xc.orig/programs/Xserver/hw/xfree86/etc/vesamodes
xc/programs/Xserver/hw/xfree86/etc/vesamodes
+--- xc.orig/programs/Xserver/hw/xfree86/etc/vesamodes 2004-04-23
12:53:57.000000000 -0700
++++ xc/programs/Xserver/hw/xfree86/etc/vesamodes 2006-05-09
21:41:06.000000000 -0700
+@@ -27,9 +27,6 @@
+ # 640x480 @ 85Hz (VESA) hsync: 43.3kHz
+ ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync
-vsync
+
+-# 800x600 @ 56Hz (VESA) hsync: 35.2kHz
+-ModeLine "800x600" 36.0 800 824 896 1024 600 601 603 625 +hsync
+vsync
+-
+ # 800x600 @ 60Hz (VESA) hsync: 37.9kHz
+ ModeLine "800x600" 40.0 800 840 968 1056 600 601 605 628 +hsync
+vsync
+
+@@ -42,9 +39,6 @@
+ # 800x600 @ 85Hz (VESA) hsync: 53.7kHz
+ ModeLine "800x600" 56.3 800 832 896 1048 600 601 604 631 +hsync
+vsync
+
+-# 1024x768i @ 43Hz (industry standard) hsync: 35.5kHz
+-ModeLine "1024x768" 44.9 1024 1032 1208 1264 768 768 776 817 +hsync
+vsync Interlace
+-
+ # 1024x768 @ 60Hz (VESA) hsync: 48.4kHz
+ ModeLine "1024x768" 65.0 1024 1048 1184 1344 768 771 777 806 -hsync
-vsync
+
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
