r1897 - in trunk: . packages packages/Xorg-driver packages/xorg-udev-rules

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Tue May 29 06:33:04 PDT 2007


Author: alexander
Date: 2007-05-29 07:33:03 -0600 (Tue, 29 May 2007)
New Revision: 1897

Removed:
   trunk/packages/915resolution/
Modified:
   trunk/Makefile
   trunk/packages/Xorg-driver/Makefile
   trunk/packages/xorg-udev-rules/extract_pci_ids.c
Log:
Replaced "i810" Xorg driver with "intel", removed 915resolution

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-05-29 12:48:32 UTC (rev 1896)
+++ trunk/Makefile	2007-05-29 13:33:03 UTC (rev 1897)
@@ -245,7 +245,7 @@
 	ch-Xorg-base ch-Xorg-util ch-Xorg-proto ch-Xorg-lib ch-libdrm ch-Mesa \
 	ch-xbitmaps ch-Xorg-app ch-xcursor-themes ch-xorg-server \
 	ch-Xorg-font ch-Xorg-driver ch-xorg-udev-rules ch-XML-Parser ch-xkeyboard-config \
-	ch-synaptics ch-inputattach ch-915resolution ch-fonts-thai \
+	ch-synaptics ch-inputattach ch-fonts-thai \
 	ch-freefont ch-fonts-dejavu ch-fonts-kochi ch-fonts-firefly ch-fonts-baekmuk \
 	ch-libjpeg ch-libtiff ch-openssh ch-glib2 ch-giflib ch-imlib ch-imlib2 \
 	ch-gc ch-w3m ch-lftp ch-cairo ch-hicolor-icon-theme \

Modified: trunk/packages/Xorg-driver/Makefile
===================================================================
--- trunk/packages/Xorg-driver/Makefile	2007-05-29 12:48:32 UTC (rev 1896)
+++ trunk/packages/Xorg-driver/Makefile	2007-05-29 13:33:03 UTC (rev 1897)
@@ -58,9 +58,9 @@
 URL-$(FILE114)= $(URLBASE)/$(FILE114)
 SHA-$(FILE114)= 99575052e29236d50db23d093a30ba0047d78e43
 
-FILE115= xf86-video-i810-1.6.5.tar.bz2
+FILE115= xf86-video-intel-2.0.0.tar.bz2
 URL-$(FILE115)= $(URLBASE)/$(FILE115)
-SHA-$(FILE115)= 7d9cf4fa18ec6dd7eefcb1589675c7bcffa384d0
+SHA-$(FILE115)= 964d31311209f1daf8605290ab638bac6f7616ee
 
 # FILE116= xf86-video-impact-0.2.0.tar.bz2
 # URL-$(FILE116)= $(URLBASE)/$(FILE116)

Modified: trunk/packages/xorg-udev-rules/extract_pci_ids.c
===================================================================
--- trunk/packages/xorg-udev-rules/extract_pci_ids.c	2007-05-29 12:48:32 UTC (rev 1896)
+++ trunk/packages/xorg-udev-rules/extract_pci_ids.c	2007-05-29 13:33:03 UTC (rev 1897)
@@ -52,12 +52,14 @@
 		/* dlopen would fail anyway */
 		return 0;
 
-	/* radeon and r128 should not be used directly,
+	/* radeon and r128 should not be used directly, i810 is an alias for intel,
 	   and sisusb is too different */
 	if (!strcmp(driver_name, "radeon"))
 		return 0;
 	if (!strcmp(driver_name, "r128"))
 		return 0;
+	if (!strcmp(driver_name, "i810"))
+		return 0;
 	if (!strcmp(driver_name, "sisusb"))
 		return 0;
 




More information about the livecd mailing list