r1423 - in trunk: . packages/Xorg-modular packages/linux

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Wed Mar 1 02:07:50 PST 2006


Author: alexander
Date: 2006-03-01 03:07:50 -0700 (Wed, 01 Mar 2006)
New Revision: 1423

Added:
   trunk/packages/Xorg-modular/xorg_server-X11R7.0_1.0.1-dotclock-1.patch
Modified:
   trunk/Makefile
   trunk/packages/Xorg-modular/Makefile
   trunk/packages/linux/debian-style-headers.sh
Log:
merge -r1418:1420 from udev_update

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-03-01 09:58:25 UTC (rev 1422)
+++ trunk/Makefile	2006-03-01 10:07:50 UTC (rev 1423)
@@ -289,7 +289,7 @@
 	ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \
 	ch-squashfs ch-cpio ch-mutt ch-msmtp ch-tin ch-mdadm ch-which ch-BRLTTY \
 	ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm ch-linux \
-	ch-ctags ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts \
+	ch-ctags ch-initramfs ch-cdrtools ch-blfs-bootscripts \
 	ch-man-fr ch-man-pages-es ch-man-pages-it ch-manpages-de ch-manpages-ru \
 	ch-anthy ch-scim ch-scim-tables ch-scim-anthy ch-scim-hangul \
 	ch-libchewing ch-scim-chewing ch-scim-pinyin ch-scim-input-pad \

Modified: trunk/packages/Xorg-modular/Makefile
===================================================================
--- trunk/packages/Xorg-modular/Makefile	2006-03-01 09:58:25 UTC (rev 1422)
+++ trunk/packages/Xorg-modular/Makefile	2006-03-01 10:07:50 UTC (rev 1423)
@@ -2,6 +2,8 @@
 VRS= X11R7.0
 URLBASE= http://xorg.freedesktop.org/releases/$(VRS)/src/everything/
 
+PATCH1= xorg_server-X11R7.0_1.0.1-dotclock-1.patch
+
 LIBDRM_VRS= 2.0
 FILE1= libdrm-$(LIBDRM_VRS).tar.gz
 DIR1= libdrm-$(LIBDRM_VRS)
@@ -56,7 +58,7 @@
 	Y-libXevie Y-libXfont Y-libXfontcache Y-libXft Y-libXi Y-libXinerama \
 	Y-libxkbfile Y-libxkbui N-libXprintUtil N-libXprintAppUtil \
 	Y-libXrandr Y-libXres Y-libXScrnSaver Y-libXTrap Y-libXtst Y-libXv \
-	Y-libXvMC Y-libXxf86dga Y-libXxf86misc Y-libXxf86vm \
+	Y-libXvMC Y-libXxf86dga Y-libXxf86misc Y-libXxf86vm Y-encodings \
 	Y-libdrm Y-mesa
 	@touch $@
 
@@ -178,6 +180,8 @@
 	sed -i -e '/DPI/s,75,94,' hw/xfree86/common/xf86Priv.h hw/dmx/dmxinit.c
 	# Allow the use of builtin fonts from libXfont.so
 	sed -i -e 's,#ifdef KDRIVESERVER,#if 1,' dix/dixfonts.c
+	# Don't attempt to exceed DDC probed maximum pixel clock
+	patch -Np1 -i ../$(PATCH1)
 	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-mesa-source=`pwd`/$(DIR2) --with-default-font-path=built-ins
 	make $(PM)
 	make install

Added: trunk/packages/Xorg-modular/xorg_server-X11R7.0_1.0.1-dotclock-1.patch
===================================================================
--- trunk/packages/Xorg-modular/xorg_server-X11R7.0_1.0.1-dotclock-1.patch	                        (rev 0)
+++ trunk/packages/Xorg-modular/xorg_server-X11R7.0_1.0.1-dotclock-1.patch	2006-03-01 10:07:50 UTC (rev 1423)
@@ -0,0 +1,59 @@
+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 2048x1536 at 60Hz instead of nice 1600x1200 at 75Hz" and
+"my LCD monitor gets confused" problems with unconfigured (i.e.,
+no "Modes" line) Xorg.
+
+diff -ur xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/common/xf86Mode.c xorg-server-X11R7.0-1.0.1/hw/xfree86/common/xf86Mode.c
+--- xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/common/xf86Mode.c	2005-07-03 14:53:42.000000000 +0600
++++ xorg-server-X11R7.0-1.0.1/hw/xfree86/common/xf86Mode.c	2006-02-28 13:05:12.000000000 +0500
+@@ -771,6 +771,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 -ur xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/common/extramodes xorg-server-X11R7.0-1.0.1/hw/xfree86/common/extramodes
+--- xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/common/extramodes	2004-04-24 01:53:57.000000000 +0600
++++ xorg-server-X11R7.0-1.0.1/hw/xfree86/common/extramodes	2006-02-28 18:07:35.000000000 +0500
+@@ -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 -ur xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/common/vesamodes xorg-server-X11R7.0-1.0.1/hw/xfree86/common/vesamodes
+--- xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/common/vesamodes	2004-04-24 01:53:57.000000000 +0600
++++ xorg-server-X11R7.0-1.0.1/hw/xfree86/common/vesamodes	2006-02-28 18:08:34.000000000 +0500
+@@ -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
+ 

Modified: trunk/packages/linux/debian-style-headers.sh
===================================================================
--- trunk/packages/linux/debian-style-headers.sh	2006-03-01 09:58:25 UTC (rev 1422)
+++ trunk/packages/linux/debian-style-headers.sh	2006-03-01 10:07:50 UTC (rev 1423)
@@ -14,7 +14,7 @@
 	    mkdir -p "$DSTDIR/$dir"
 	done )
 ( cd "$SRCDIR" ; find -type f -a '(' -name Kconfig\* \
-    -o -name Makefile -o -name \*.s ')' ) | (
+    -o -name Makefile\* -o -name \*.s ')' ) | (
 	cd "$SRCDIR"
 	while read file ; do
 	    cp -v "$file" "$DSTDIR/$file"




More information about the livecd mailing list