r1817 - in trunk: . etc packages/Mesa packages/Xorg-app packages/Xorg-driver packages/Xorg-font packages/Xorg-lib packages/Xorg-proto packages/Xorg-util packages/fontconfig packages/freetype packages/libdrm packages/libpng packages/xorg-server

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Tue Feb 27 06:22:25 PST 2007


Author: alexander
Date: 2007-02-27 07:22:25 -0700 (Tue, 27 Feb 2007)
New Revision: 1817

Added:
   trunk/packages/fontconfig/65-firefly.conf
   trunk/packages/fontconfig/66-ttf-thai.conf
   trunk/packages/fontconfig/local.conf
   trunk/packages/xorg-server/xorg_server-1.2.0-dotclock-1.patch
Removed:
   trunk/etc/fonts/
   trunk/packages/xorg-server/xorg_server-1.1.1-dotclock-1.patch
   trunk/packages/xorg-server/xorg_server-1.1.1-newmesa-1.patch
Modified:
   trunk/Makefile
   trunk/packages/Mesa/Makefile
   trunk/packages/Xorg-app/Makefile
   trunk/packages/Xorg-driver/Makefile
   trunk/packages/Xorg-font/Makefile
   trunk/packages/Xorg-lib/Makefile
   trunk/packages/Xorg-proto/Makefile
   trunk/packages/Xorg-util/Makefile
   trunk/packages/fontconfig/Makefile
   trunk/packages/freetype/Makefile
   trunk/packages/libdrm/Makefile
   trunk/packages/libpng/Makefile
   trunk/packages/xorg-server/Makefile
Log:
New FreeType, Fontconfig and Xorg versions

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-02-24 13:09:35 UTC (rev 1816)
+++ trunk/Makefile	2007-02-27 14:22:25 UTC (rev 1817)
@@ -249,11 +249,11 @@
 	ch-screen ch-pkgconfig ch-libidn ch-libgpg-error ch-libgcrypt \
 	ch-gnutls ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \
 	ch-subversion ch-lfs-bootscripts ch-livecd-bootscripts ch-docbook-xml ch-libxslt \
-	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng stop-here \
+	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng \
 	ch-freetype ch-fontconfig \
 	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-XML-Parser ch-xkeyboard-config \
+	ch-Xorg-font ch-Xorg-driver ch-XML-Parser ch-xkeyboard-config stop-here \
 	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 \

Modified: trunk/packages/Mesa/Makefile
===================================================================
--- trunk/packages/Mesa/Makefile	2007-02-24 13:09:35 UTC (rev 1816)
+++ trunk/packages/Mesa/Makefile	2007-02-27 14:22:25 UTC (rev 1817)
@@ -1,16 +1,16 @@
 # Mesa Makefile
 
 NM= Mesa
-VRS= 6.5.1
+VRS= 6.5.2
 DIR= $(NM)-$(VRS)
 
 FILE= MesaLib-$(VRS).tar.bz2
 URL-$(FILE)= http://heanet.dl.sourceforge.net/sourceforge/mesa3d/$(FILE)
-SHA-$(FILE)= cd3b314808534b0306c7f89e9a72c9c23dbff239
+SHA-$(FILE)= ba860bb6ee57c02202342dfd5927464a068ea18f
 
 FILE1= MesaDemos-$(VRS).tar.bz2
 URL-$(FILE1)= http://heanet.dl.sourceforge.net/sourceforge/mesa3d/$(FILE1)
-SHA-$(FILE1)= 6576410f51ff2c2bf68cec1dcb188ea26307bf56
+SHA-$(FILE1)= beac8b2fa9c6e25efd44b911d2d7952b2f87534c
 
 # Targets
 

Modified: trunk/packages/Xorg-app/Makefile
===================================================================
--- trunk/packages/Xorg-app/Makefile	2007-02-24 13:09:35 UTC (rev 1816)
+++ trunk/packages/Xorg-app/Makefile	2007-02-27 14:22:25 UTC (rev 1817)
@@ -1,5 +1,5 @@
 NM= X.org-app
-VRS= X11R7.1
+VRS= X11R7.2
 URLBASE= http://xorg.freedesktop.org/releases/individual/app
 FILE101= iceauth-1.0.1.tar.bz2
 
@@ -10,9 +10,9 @@
 URL-$(FILE102)= $(URLBASE)/$(FILE102)
 SHA-$(FILE102)= f7e243cd26bacb9c5000eaf1595bb6c7b8bafb14
 
-FILE103= mkfontscale-1.0.2.tar.bz2
+FILE103= mkfontscale-1.0.3.tar.bz2
 URL-$(FILE103)= $(URLBASE)/$(FILE103)
-SHA-$(FILE103)= 9e33720a3c60b8cded82301a4b0e5d01a231e46c
+SHA-$(FILE103)= f635e66e8fc214a52c29c7fcb459fb65ba4ce1e4
 
 FILE104= rgb-1.0.1.tar.bz2
 URL-$(FILE104)= $(URLBASE)/$(FILE104)
@@ -22,21 +22,21 @@
 URL-$(FILE105)= $(URLBASE)/$(FILE105)
 SHA-$(FILE105)= e5785e243cea56c48a6492f6ec329c5cf7dbbca6
 
-FILE106= sessreg-1.0.0.tar.bz2
+FILE106= sessreg-1.0.2.tar.bz2
 URL-$(FILE106)= $(URLBASE)/$(FILE106)
-SHA-$(FILE106)= 2a583836ad049fe49bc4b968e63257ece676705b
+SHA-$(FILE106)= 2f2a36967ecffb29461ae28def3b013955e584dd
 
-FILE107= setxkbmap-1.0.2.tar.bz2
+FILE107= setxkbmap-1.0.3.tar.bz2
 URL-$(FILE107)= $(URLBASE)/$(FILE107)
-SHA-$(FILE107)= f823cad550b83da5fbc432b2f138d41915266a38
+SHA-$(FILE107)= 0e11546b3cedd8ba53a753685b60be15cf34316a
 
 FILE108= smproxy-1.0.2.tar.bz2
 URL-$(FILE108)= $(URLBASE)/$(FILE108)
 SHA-$(FILE108)= 18c49ba13a32dc83d00b2183455e31d5d96aec6f
 
-FILE109= xauth-1.0.1.tar.bz2
+FILE109= xauth-1.0.2.tar.bz2
 URL-$(FILE109)= $(URLBASE)/$(FILE109)
-SHA-$(FILE109)= d8a8f54a6c8921cbb605a074ddb030873c6dd7e5
+SHA-$(FILE109)= 64bf289e3b3776de7f6b5984eb6ed238cfe9e2aa
 
 FILE110= xcursorgen-1.0.1.tar.bz2
 URL-$(FILE110)= $(URLBASE)/$(FILE110)
@@ -62,9 +62,9 @@
 URL-$(FILE115)= $(URLBASE)/$(FILE115)
 SHA-$(FILE115)= caab4f9b56fc76edd8500d596d46cf1a9794caff
 
-FILE116= xkbcomp-1.0.2.tar.bz2
+FILE116= xkbcomp-1.0.3.tar.bz2
 URL-$(FILE116)= $(URLBASE)/$(FILE116)
-SHA-$(FILE116)= 2e01ea15e85a815a40d028df794bdc41aed1a25c
+SHA-$(FILE116)= b0e32f66dd9a18dd5d28cd582f062709b28e901a
 
 FILE117= xkbutils-1.0.1.tar.bz2
 URL-$(FILE117)= $(URLBASE)/$(FILE117)

Modified: trunk/packages/Xorg-driver/Makefile
===================================================================
--- trunk/packages/Xorg-driver/Makefile	2007-02-24 13:09:35 UTC (rev 1816)
+++ trunk/packages/Xorg-driver/Makefile	2007-02-27 14:22:25 UTC (rev 1817)
@@ -1,5 +1,5 @@
 NM= X.org-driver
-VRS= X11R7.1
+VRS= X11R7.2
 URLBASE= http://xorg.freedesktop.org/releases/individual/driver
 
 FILE101= xf86-input-evdev-1.1.2.tar.bz2
@@ -42,25 +42,25 @@
 URL-$(FILE110)= $(URLBASE)/$(FILE110)
 SHA-$(FILE110)= e82a9384828ce3f43ea7d3623df76ffa17aa4813
 
-FILE111= xf86-video-fbdev-0.3.0.tar.bz2
+FILE111= xf86-video-fbdev-0.3.1.tar.bz2
 URL-$(FILE111)= $(URLBASE)/$(FILE111)
-SHA-$(FILE111)= 66b3890398b0ad8f2991e7403be6f902f1c14e22
+SHA-$(FILE111)= 6b1cc6fbe0d1b34daff6cb202db6827007ec1cb5
 
 FILE112= xf86-video-glint-1.1.1.tar.bz2
 URL-$(FILE112)= $(URLBASE)/$(FILE112)
 SHA-$(FILE112)= 0e70ae96862483e66e75553dd19ef6ef5bcb8132
 
-FILE113= xf86-video-i128-1.2.0.tar.bz2
+FILE113= xf86-video-i128-1.2.1.tar.bz2
 URL-$(FILE113)= $(URLBASE)/$(FILE113)
-SHA-$(FILE113)= 69a323b0f6d1cdec1bd77b1f955e2096c709800b
+SHA-$(FILE113)= 8906c29c25dc4b54958052b3327d4d2150d1155e
 
 FILE114= xf86-video-i740-1.1.0.tar.bz2
 URL-$(FILE114)= $(URLBASE)/$(FILE114)
 SHA-$(FILE114)= 99575052e29236d50db23d093a30ba0047d78e43
 
-FILE115= xf86-video-i810-1.7.2.tar.bz2
+FILE115= xf86-video-i810-1.6.5.tar.bz2
 URL-$(FILE115)= $(URLBASE)/$(FILE115)
-SHA-$(FILE115)= ed098545cc648bfd33ce06d0401a17bb77161ebb
+SHA-$(FILE115)= 7d9cf4fa18ec6dd7eefcb1589675c7bcffa384d0
 
 # FILE116= xf86-video-impact-0.2.0.tar.bz2
 # URL-$(FILE116)= $(URLBASE)/$(FILE116)
@@ -70,9 +70,9 @@
 URL-$(FILE117)= $(URLBASE)/$(FILE117)
 SHA-$(FILE117)= 2ae92a244bafef83e4b016cab204e2f5797cdb09
 
-FILE118= xf86-video-mga-1.4.3.tar.bz2
+FILE118= xf86-video-mga-1.4.6.1.tar.bz2
 URL-$(FILE118)= $(URLBASE)/$(FILE118)
-SHA-$(FILE118)= efe99a11f08eb39e8c31dfe3d6d9b1bf0159056d
+SHA-$(FILE118)= 8b9f619fc1baf711fcae38dbf4851d277a5cbc1a
 
 FILE119= xf86-video-neomagic-1.1.1.tar.bz2
 URL-$(FILE119)= $(URLBASE)/$(FILE119)
@@ -86,17 +86,17 @@
 URL-$(FILE121)= $(URLBASE)/$(FILE121)
 SHA-$(FILE121)= 58ea8edbdf18dc8dd194f9d08761f829bfd09a01
 
-FILE122= xf86-video-nv-1.2.0.tar.bz2
+FILE122= xf86-video-nv-1.2.2.1.tar.bz2
 URL-$(FILE122)= $(URLBASE)/$(FILE122)
-SHA-$(FILE122)= d98cb84e7220251fdcd278c4269763f17aef1e9b
+SHA-$(FILE122)= d630ec2dd7f326650c5b73f4913ac65f0b817060
 
-FILE123= xf86-video-rendition-4.1.1.tar.bz2
+FILE123= xf86-video-rendition-4.1.3.tar.bz2
 URL-$(FILE123)= $(URLBASE)/$(FILE123)
-SHA-$(FILE123)= 1ca209d9a22bf9daf1c7f7f9c79150dc9ab7c72b
+SHA-$(FILE123)= 9cbd77ad6cba6807823fff3b74923b955580a540
 
-FILE124= xf86-video-s3-0.4.1.tar.bz2
+FILE124= xf86-video-s3-0.5.0.tar.bz2
 URL-$(FILE124)= $(URLBASE)/$(FILE124)
-SHA-$(FILE124)= de1d269f906ea811a1428a485d7cde6b76dafd3c
+SHA-$(FILE124)= 1ae624635f71f82ecc73999cad5499a1d5d69be6
 
 FILE125= xf86-video-s3virge-1.9.1.tar.bz2
 URL-$(FILE125)= $(URLBASE)/$(FILE125)
@@ -110,33 +110,33 @@
 URL-$(FILE127)= $(URLBASE)/$(FILE127)
 SHA-$(FILE127)= ba0e2f08d97841df8925b609925b1328164ca6ab
 
-FILE128= xf86-video-sis-0.9.2.tar.bz2
+FILE128= xf86-video-sis-0.9.3.tar.bz2
 URL-$(FILE128)= $(URLBASE)/$(FILE128)
-SHA-$(FILE128)= ac7d2c5d19d93e28a3331c2a05349c468e1d88cb
+SHA-$(FILE128)= fb386185a91bbc6764445ef251d4a0216ec9b9d0
 
 FILE129= xf86-video-sisusb-0.8.1.tar.bz2
 URL-$(FILE129)= $(URLBASE)/$(FILE129)
 SHA-$(FILE129)= d1c925b0e899f543a32842a6bfbff4476b9b66e1
 
-FILE130= xf86-video-tdfx-1.2.2.tar.bz2
+FILE130= xf86-video-tdfx-1.3.0.tar.bz2
 URL-$(FILE130)= $(URLBASE)/$(FILE130)
-SHA-$(FILE130)= 3a831921f249574d4a387b7917a39c4b9240fecc
+SHA-$(FILE130)= 8089883c87b64c2876b9152b4820901cc6273f57
 
 FILE131= xf86-video-tga-1.1.0.tar.bz2
 URL-$(FILE131)= $(URLBASE)/$(FILE131)
 SHA-$(FILE131)= 448600dd45aedfaf0ba8a46eaf04d03895a712ed
 
-FILE132= xf86-video-trident-1.2.2.tar.bz2
+FILE132= xf86-video-trident-1.2.3.tar.bz2
 URL-$(FILE132)= $(URLBASE)/$(FILE132)
-SHA-$(FILE132)= 9518c21662562229b6a285f39c6bde0a038880e9
+SHA-$(FILE132)= d75ca064bee6817209266fc85bbcfac671ed0642
 
 FILE133= xf86-video-tseng-1.1.1.tar.bz2
 URL-$(FILE133)= $(URLBASE)/$(FILE133)
 SHA-$(FILE133)= 7eb1cd73983aaa874dbb480efc7982063eab6af8
 
-FILE134= xf86-video-vesa-1.2.2.tar.bz2
+FILE134= xf86-video-vesa-1.3.0.tar.bz2
 URL-$(FILE134)= $(URLBASE)/$(FILE134)
-SHA-$(FILE134)= aa22994fac3dadf41b7b641a816f704129831a77
+SHA-$(FILE134)= 09d74f838c07c58b6eba3600f3afa5fb74420ff4
 
 FILE135= xf86-video-vga-4.1.0.tar.bz2
 URL-$(FILE135)= $(URLBASE)/$(FILE135)
@@ -146,9 +146,9 @@
 URL-$(FILE136)= $(URLBASE)/$(FILE136)
 SHA-$(FILE136)= 34297439a05d054b343df407e86b6bd7d1cece97
 
-FILE137= xf86-video-vmware-10.13.0.tar.bz2
+FILE137= xf86-video-vmware-10.14.1.tar.bz2
 URL-$(FILE137)= $(URLBASE)/$(FILE137)
-SHA-$(FILE137)= 188d53150240a7879e042f545c49d007b8af8d9f
+SHA-$(FILE137)= 7c03d3b18d4765c5abd800ed301f8b705a889adb
 
 FILE138= xf86-video-voodoo-1.1.1.tar.bz2
 URL-$(FILE138)= $(URLBASE)/$(FILE138)

Modified: trunk/packages/Xorg-font/Makefile
===================================================================
--- trunk/packages/Xorg-font/Makefile	2007-02-24 13:09:35 UTC (rev 1816)
+++ trunk/packages/Xorg-font/Makefile	2007-02-27 14:22:25 UTC (rev 1817)
@@ -1,10 +1,10 @@
 NM= X.org-font
-VRS= X11R7.1
+VRS= X11R7.2
 URLBASE= http://xorg.freedesktop.org/releases/individual/font
 
-FILE101= encodings-1.0.0.tar.bz2
+FILE101= encodings-1.0.2.tar.bz2
 URL-$(FILE101)= $(URLBASE)/$(FILE101)
-SHA-$(FILE101)= daa208a7386ddda28d49de1dba708da9e2c2da79
+SHA-$(FILE101)= 63622374470204f6501ffb5f4df84228d859c9cf
 
 FILE102= font-bh-ttf-1.0.0.tar.bz2
 URL-$(FILE102)= $(URLBASE)/$(FILE102)

Modified: trunk/packages/Xorg-lib/Makefile
===================================================================
--- trunk/packages/Xorg-lib/Makefile	2007-02-24 13:09:35 UTC (rev 1816)
+++ trunk/packages/Xorg-lib/Makefile	2007-02-27 14:22:25 UTC (rev 1817)
@@ -1,163 +1,172 @@
 NM= X.org-lib
-VRS= X11R7.1
+VRS= X11R7.2
 URLBASE= http://xorg.freedesktop.org/releases/individual/lib
+XCBBASE= http://xcb.freedesktop.org/dist
 
-FILE101= xtrans-1.0.2.tar.bz2
-URL-$(FILE101)= $(URLBASE)/$(FILE101)
-SHA-$(FILE101)= 06071f09a934cd0e5fc9b4d8514f238d14ad1d51
+FILE101= libpthread-stubs-0.1.tar.bz2
+URL-$(FILE101)= $(XCBBASE)/$(FILE101)
+SHA-$(FILE101)= 34ef40880d0112dc6d32b386d59ce94f2c139eef
 
-FILE102= libXau-1.0.2.tar.bz2
+FILE102= xtrans-1.0.3.tar.bz2
 URL-$(FILE102)= $(URLBASE)/$(FILE102)
-SHA-$(FILE102)= 1e33aaa3c13871ef1ee02a6db1b0ee6370beea99
+SHA-$(FILE102)= 767146fafecf9cf74bea847fb29b57b466782e73
 
-FILE103= libXdmcp-1.0.2.tar.bz2
+FILE103= libXau-1.0.3.tar.bz2
 URL-$(FILE103)= $(URLBASE)/$(FILE103)
-SHA-$(FILE103)= 0e2fd4a0d8e8b94a4b5af85f08a2fff27bf90238
+SHA-$(FILE103)= e365d2b9c781ab8d07f79c85bbc48480d1574199
 
-FILE104= libX11-1.0.3.tar.bz2
+FILE104= libXdmcp-1.0.2.tar.bz2
 URL-$(FILE104)= $(URLBASE)/$(FILE104)
-SHA-$(FILE104)= ec0493d3669862a9a4f9955532e3bd73b0806be1
+SHA-$(FILE104)= 0e2fd4a0d8e8b94a4b5af85f08a2fff27bf90238
 
-FILE105= libXext-1.0.2.tar.bz2
-URL-$(FILE105)= $(URLBASE)/$(FILE105)
-SHA-$(FILE105)= 29f07b73ab9688855c6a5f046ca07e021a634095
+FILE105= libxcb-1.0.tar.bz2
+URL-$(FILE105)= $(XCBBASE)/$(FILE105)
+SHA-$(FILE105)= 0a7e0b65e6f1e0ef4dcaecaa01c4b2854206e96e
 
-FILE106= libdmx-1.0.2.tar.bz2
+FILE106= libX11-1.1.1.tar.bz2
 URL-$(FILE106)= $(URLBASE)/$(FILE106)
-SHA-$(FILE106)= cafa14a5eb60ff4397dcb03af1197a43036fab54
+SHA-$(FILE106)= 048dc3d850666010e81a86bbe0960a643557251a
 
-FILE107= libfontenc-1.0.3.tar.bz2
+FILE107= libXext-1.0.2.tar.bz2
 URL-$(FILE107)= $(URLBASE)/$(FILE107)
-SHA-$(FILE107)= e8e43a942bdec770e82742919ac7db28e96634e2
+SHA-$(FILE107)= 29f07b73ab9688855c6a5f046ca07e021a634095
 
-FILE108= libFS-1.0.0.tar.bz2
+FILE108= libdmx-1.0.2.tar.bz2
 URL-$(FILE108)= $(URLBASE)/$(FILE108)
-SHA-$(FILE108)= 603ce6e8883b2629ff603f7709427b062be437fe
+SHA-$(FILE108)= cafa14a5eb60ff4397dcb03af1197a43036fab54
 
-FILE109= libICE-1.0.2.tar.bz2
+FILE109= libfontenc-1.0.4.tar.bz2
 URL-$(FILE109)= $(URLBASE)/$(FILE109)
-SHA-$(FILE109)= f5795ee83b2efb6e53eb2c502e3b84391292376e
+SHA-$(FILE109)= 69876a14b18c3c7c829cd79880c69db7b0732d9b
 
-FILE110= liblbxutil-1.0.1.tar.bz2
+FILE110= libFS-1.0.0.tar.bz2
 URL-$(FILE110)= $(URLBASE)/$(FILE110)
-SHA-$(FILE110)= 91b21ca5f315f844c2f12aba898c4d2c527f5fb6
+SHA-$(FILE110)= 603ce6e8883b2629ff603f7709427b062be437fe
 
-FILE111= liboldX-1.0.1.tar.bz2
+FILE111= libICE-1.0.3.tar.bz2
 URL-$(FILE111)= $(URLBASE)/$(FILE111)
-SHA-$(FILE111)= cc7261b11d8b988e6f3c23335f9e5ebb2f8e768b
+SHA-$(FILE111)= be6ca5cc02bd8cd216217a5315a2c9ab9af82fb4
 
-FILE112= libSM-1.0.2.tar.bz2
+FILE112= liblbxutil-1.0.1.tar.bz2
 URL-$(FILE112)= $(URLBASE)/$(FILE112)
-SHA-$(FILE112)= 11b3d081035c0870eb60471658193262e0f9e38a
+SHA-$(FILE112)= 91b21ca5f315f844c2f12aba898c4d2c527f5fb6
 
-FILE113= libXt-1.0.3.tar.bz2
+FILE113= liboldX-1.0.1.tar.bz2
 URL-$(FILE113)= $(URLBASE)/$(FILE113)
-SHA-$(FILE113)= 65d40e3ea93652aba9aaea845d15b6aef0710186
+SHA-$(FILE113)= cc7261b11d8b988e6f3c23335f9e5ebb2f8e768b
 
-FILE114= libXmu-1.0.2.tar.bz2
+FILE114= libSM-1.0.2.tar.bz2
 URL-$(FILE114)= $(URLBASE)/$(FILE114)
-SHA-$(FILE114)= c375243a2ef45977a5bae337b3249e7e1bb802d5
+SHA-$(FILE114)= 11b3d081035c0870eb60471658193262e0f9e38a
 
-FILE115= libXpm-3.5.6.tar.bz2
+FILE115= libXt-1.0.4.tar.bz2
 URL-$(FILE115)= $(URLBASE)/$(FILE115)
-SHA-$(FILE115)= 870e29be101e9063963a31feab4adb662bd1ead9
+SHA-$(FILE115)= 3a7d7d390214876c925d5226ef3949b6c5bad6ce
 
-FILE116= libXaw-1.0.2.tar.bz2
+FILE116= libXmu-1.0.3.tar.bz2
 URL-$(FILE116)= $(URLBASE)/$(FILE116)
-SHA-$(FILE116)= d15a520d714a4125fa550cfdb391f8a03cd3e26d
+SHA-$(FILE116)= 7f2baa63b68ff8bdb524f3d5a2643066a556973b
 
-FILE117= libXfixes-4.0.2.tar.bz2
+FILE117= libXpm-3.5.6.tar.bz2
 URL-$(FILE117)= $(URLBASE)/$(FILE117)
-SHA-$(FILE117)= 19c94bc4427690db63136a5a405e09216b12eca3
+SHA-$(FILE117)= 870e29be101e9063963a31feab4adb662bd1ead9
 
-FILE118= libXcomposite-0.3.1.tar.bz2
+FILE118= libXaw-1.0.2.tar.bz2
 URL-$(FILE118)= $(URLBASE)/$(FILE118)
-SHA-$(FILE118)= d5c7883f1d3a98e0fd055226b2a1d4b6ffe5ca54
+SHA-$(FILE118)= d15a520d714a4125fa550cfdb391f8a03cd3e26d
 
-FILE119= libXrender-0.9.2.tar.bz2
+FILE119= libXfixes-4.0.3.tar.bz2
 URL-$(FILE119)= $(URLBASE)/$(FILE119)
-SHA-$(FILE119)= 79d6d5dff763d105923ba0bb3c563483cf389d8a
+SHA-$(FILE119)= 37297e64239e1cc2a7b4372e27c5f9325f9f29dc
 
-FILE120= libXdamage-1.0.3.tar.bz2
+FILE120= libXcomposite-0.3.1.tar.bz2
 URL-$(FILE120)= $(URLBASE)/$(FILE120)
-SHA-$(FILE120)= be9513ffe0429b2872b20eae7a8315df186a712a
+SHA-$(FILE120)= d5c7883f1d3a98e0fd055226b2a1d4b6ffe5ca54
 
-FILE121= libXcursor-1.1.8.tar.bz2
+FILE121= libXrender-0.9.2.tar.bz2
 URL-$(FILE121)= $(URLBASE)/$(FILE121)
-SHA-$(FILE121)= 4600627d4d8a0edb7c10de17c67d8c082d12ddd7
+SHA-$(FILE121)= 79d6d5dff763d105923ba0bb3c563483cf389d8a
 
-FILE122= libXevie-1.0.2.tar.bz2
+FILE122= libXdamage-1.0.4.tar.bz2
 URL-$(FILE122)= $(URLBASE)/$(FILE122)
-SHA-$(FILE122)= d22fd24d8f096fdff54d303d63fea1422f0cfeea
+SHA-$(FILE122)= 7bed679e1ecf74421fdf2feb6d153298348d9629
 
-FILE123= libXfont-1.2.3.tar.bz2
+FILE123= libXcursor-1.1.8.tar.bz2
 URL-$(FILE123)= $(URLBASE)/$(FILE123)
-SHA-$(FILE123)= 97aed7a88c43086a816a3586d08e9ed17411d6d9
+SHA-$(FILE123)= 4600627d4d8a0edb7c10de17c67d8c082d12ddd7
 
-FILE124= libXfontcache-1.0.3.tar.bz2
+FILE124= libXevie-1.0.2.tar.bz2
 URL-$(FILE124)= $(URLBASE)/$(FILE124)
-SHA-$(FILE124)= e3f053036b90fce032f14de74bd6b231b2f83787
+SHA-$(FILE124)= d22fd24d8f096fdff54d303d63fea1422f0cfeea
 
-FILE125= libXft-2.1.11.tar.bz2
+FILE125= libXfont-1.2.7.tar.bz2
 URL-$(FILE125)= $(URLBASE)/$(FILE125)
-SHA-$(FILE125)= 74d06ca641f5c5f07af881380aef1601d170d85e
+SHA-$(FILE125)= 60deba746e544785ca05c7c68ccfbd5d71370a29
 
-FILE126= libXi-1.0.1.tar.bz2
+FILE126= libXfontcache-1.0.4.tar.bz2
 URL-$(FILE126)= $(URLBASE)/$(FILE126)
-SHA-$(FILE126)= d27fd822ee29ff5ccf4339ca78e4d91abdb73415
+SHA-$(FILE126)= 25fbf6df365c0296b58124c46647facaf9072668
 
-FILE127= libXinerama-1.0.1.tar.bz2
+FILE127= libXft-2.1.12.tar.bz2
 URL-$(FILE127)= $(URLBASE)/$(FILE127)
-SHA-$(FILE127)= 1c6c96105ac7d28ea3b50d0f71f749569b8d299e
+SHA-$(FILE127)= c55fb1b79e6e8459a343e4986f0607a438eff340
 
-FILE128= libxkbfile-1.0.4.tar.bz2
+FILE128= libXi-1.0.2.tar.bz2
 URL-$(FILE128)= $(URLBASE)/$(FILE128)
-SHA-$(FILE128)= 1635903c1f4481eeffbf65f62cf70df7b9de36f7
+SHA-$(FILE128)= bd830185ffa45017333d0856053ca8ec37d47bae
 
-FILE129= libxkbui-1.0.2.tar.bz2
+FILE129= libXinerama-1.0.1.tar.bz2
 URL-$(FILE129)= $(URLBASE)/$(FILE129)
-SHA-$(FILE129)= bd6f1d6fa390d3fee118f9d5b15e156315576b9f
+SHA-$(FILE129)= 1c6c96105ac7d28ea3b50d0f71f749569b8d299e
 
-FILE130= libXrandr-1.1.2.tar.bz2
+FILE130= libxkbfile-1.0.4.tar.bz2
 URL-$(FILE130)= $(URLBASE)/$(FILE130)
-SHA-$(FILE130)= 8f328c8523f2290144d490a9f7709d14584979ce
+SHA-$(FILE130)= 1635903c1f4481eeffbf65f62cf70df7b9de36f7
 
-FILE131= libXres-1.0.2.tar.bz2
+FILE131= libxkbui-1.0.2.tar.bz2
 URL-$(FILE131)= $(URLBASE)/$(FILE131)
-SHA-$(FILE131)= ffe3eb250240d0eb1752063111a7f4fef3d3c4ce
+SHA-$(FILE131)= bd6f1d6fa390d3fee118f9d5b15e156315576b9f
 
-FILE132= libXScrnSaver-1.1.1.tar.bz2
+FILE132= libXrandr-1.1.2.tar.bz2
 URL-$(FILE132)= $(URLBASE)/$(FILE132)
-SHA-$(FILE132)= 18fcbbb658d38337552f3d86fc5975663c550fcf
+SHA-$(FILE132)= 8f328c8523f2290144d490a9f7709d14584979ce
 
-FILE133= libXTrap-1.0.0.tar.bz2
+FILE133= libXres-1.0.3.tar.bz2
 URL-$(FILE133)= $(URLBASE)/$(FILE133)
-SHA-$(FILE133)= 3ed2d68e7bfcb065cd6e9d6b1e38044f2fb355c9
+SHA-$(FILE133)= 60fdf5e612feac9ba379d0a5c755b8dd3c0bc489
 
-FILE134= libXtst-1.0.1.tar.bz2
+FILE134= libXScrnSaver-1.1.2.tar.bz2
 URL-$(FILE134)= $(URLBASE)/$(FILE134)
-SHA-$(FILE134)= 0001bfb58eb28bdef9ab6acfa158a4bf99519ffb
+SHA-$(FILE134)= da54583d4194b3a48ec6d6d7adbdbfab41391c12
 
-FILE135= libXv-1.0.2.tar.bz2
+FILE135= libXTrap-1.0.0.tar.bz2
 URL-$(FILE135)= $(URLBASE)/$(FILE135)
-SHA-$(FILE135)= 696512e41415842958f8d559dd71660cc762935b
+SHA-$(FILE135)= 3ed2d68e7bfcb065cd6e9d6b1e38044f2fb355c9
 
-FILE136= libXvMC-1.0.3.tar.bz2
+FILE136= libXtst-1.0.1.tar.bz2
 URL-$(FILE136)= $(URLBASE)/$(FILE136)
-SHA-$(FILE136)= 3fd45483638ba62a3542bc4e945cad30d23c60f5
+SHA-$(FILE136)= 0001bfb58eb28bdef9ab6acfa158a4bf99519ffb
 
-FILE137= libXxf86dga-1.0.1.tar.bz2
+FILE137= libXv-1.0.3.tar.bz2
 URL-$(FILE137)= $(URLBASE)/$(FILE137)
-SHA-$(FILE137)= b293b30a5951179da7fdfba16ebba04fd8f3aa0b
+SHA-$(FILE137)= 6e286df1f8dc3d170d6121f00c96c5bc8a60b71c
 
-FILE138= libXxf86misc-1.0.1.tar.bz2
+FILE138= libXvMC-1.0.4.tar.bz2
 URL-$(FILE138)= $(URLBASE)/$(FILE138)
-SHA-$(FILE138)= cbe908951802d6bd4489a2ca078434c16979d8e5
+SHA-$(FILE138)= e035cabb8ca61bc665746b02bf97549c253b4557
 
-FILE139= libXxf86vm-1.0.1.tar.bz2
+FILE139= libXxf86dga-1.0.1.tar.bz2
 URL-$(FILE139)= $(URLBASE)/$(FILE139)
-SHA-$(FILE139)= 75469e9ef5bc29dc84fcc5e35251583d10c04859
+SHA-$(FILE139)= b293b30a5951179da7fdfba16ebba04fd8f3aa0b
 
+FILE140= libXxf86misc-1.0.1.tar.bz2
+URL-$(FILE140)= $(URLBASE)/$(FILE140)
+SHA-$(FILE140)= cbe908951802d6bd4489a2ca078434c16979d8e5
+
+FILE141= libXxf86vm-1.0.1.tar.bz2
+URL-$(FILE141)= $(URLBASE)/$(FILE141)
+SHA-$(FILE141)= 75469e9ef5bc29dc84fcc5e35251583d10c04859
+
 ALLFILES= $(foreach FILE,$(sort $(filter FILE%,$(.VARIABLES))),$($(FILE)))
 
 include $(ROOT)/scripts/functions

Modified: trunk/packages/Xorg-proto/Makefile
===================================================================
--- trunk/packages/Xorg-proto/Makefile	2007-02-24 13:09:35 UTC (rev 1816)
+++ trunk/packages/Xorg-proto/Makefile	2007-02-27 14:22:25 UTC (rev 1817)
@@ -1,10 +1,11 @@
 NM= X.org-proto
-VRS= X11R7.1
+VRS= X11R7.2
 URLBASE= http://xorg.freedesktop.org/releases/individual/proto
+XCBBASE= http://xcb.freedesktop.org/dist
 
-# FILE101= applewmproto-1.0.3.tar.bz2
-# URL-$(FILE101)= $(URLBASE)/$(FILE101)
-# SHA-$(FILE101)= c2c94755f453b6f8df53400f4e12f428cfefbb53
+FILE101= xcb-proto-1.0.tar.bz2
+URL-$(FILE101)= $(XCBBASE)/$(FILE101)
+SHA-$(FILE101)= c7252cc74f75c997227b4dcdba2cb654d89cecda
 
 FILE102= bigreqsproto-1.0.2.tar.bz2
 URL-$(FILE102)= $(URLBASE)/$(FILE102)
@@ -122,9 +123,9 @@
 URL-$(FILE130)= $(URLBASE)/$(FILE130)
 SHA-$(FILE130)= d09ef306ffc0d058120051d88dd64776fd0de0d5
 
-FILE131= xproto-7.0.8.tar.bz2
+FILE131= xproto-7.0.10.tar.bz2
 URL-$(FILE131)= $(URLBASE)/$(FILE131)
-SHA-$(FILE131)= f3b3a8d65dc0d96902871ac4bb749cbf809f13a0
+SHA-$(FILE131)= be4f1e644edd2f010da25803d4471d7331ed517b
 
 FILE132= xproxymanagementprotocol-1.0.2.tar.bz2
 URL-$(FILE132)= $(URLBASE)/$(FILE132)

Modified: trunk/packages/Xorg-util/Makefile
===================================================================
--- trunk/packages/Xorg-util/Makefile	2007-02-24 13:09:35 UTC (rev 1816)
+++ trunk/packages/Xorg-util/Makefile	2007-02-27 14:22:25 UTC (rev 1817)
@@ -1,10 +1,10 @@
 NM= X.org-util
-VRS= X11R7.1
+VRS= X11R7.2
 URLBASE= http://xorg.freedesktop.org/releases/individual/util
 
-FILE101= util-macros-1.1.1.tar.bz2
+FILE101= util-macros-1.1.5.tar.bz2
 URL-$(FILE101)= $(URLBASE)/$(FILE101)
-SHA-$(FILE101)= c1ad23bbdd3c087e061000ae998401b671686406
+SHA-$(FILE101)= c4bbfa389df7e5f568599d6313f2460a381f0502
 
 FILE102= gccmakedep-1.0.2.tar.bz2
 URL-$(FILE102)= $(URLBASE)/$(FILE102)

Added: trunk/packages/fontconfig/65-firefly.conf
===================================================================
--- trunk/packages/fontconfig/65-firefly.conf	                        (rev 0)
+++ trunk/packages/fontconfig/65-firefly.conf	2007-02-27 14:22:25 UTC (rev 1817)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<alias>
+		<family>serif</family>
+		<prefer>
+			<family>AR PL New Sung</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>sans-serif</family>
+		<prefer>
+			<family>AR PL New Sung</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>monospace</family>
+		<prefer>
+			<family>AR PL New Sung</family>
+		</prefer>
+	</alias>
+</fontconfig>

Added: trunk/packages/fontconfig/66-ttf-thai.conf
===================================================================
--- trunk/packages/fontconfig/66-ttf-thai.conf	                        (rev 0)
+++ trunk/packages/fontconfig/66-ttf-thai.conf	2007-02-27 14:22:25 UTC (rev 1817)
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+        <alias>
+                <family>Loma</family>
+                <family>Garuda</family>
+                <family>Kinari</family>
+                <family>Purisa</family>
+                <default><family>sans-serif</family></default>
+        </alias>
+        <alias>
+                <family>Norasi</family>
+                <default><family>serif</family></default>
+        </alias>
+        <alias>
+                <family>TlwgMono</family>
+                <family>TlwgTypewriter</family>
+                <default><family>monospace</family></default>
+        </alias>
+        <alias>
+                <family>sans-serif</family>
+                <prefer>
+                        <family>Loma</family>
+                </prefer>
+        </alias>
+        <alias>
+                <family>serif</family>
+                <prefer>
+                        <family>Loma</family>
+                </prefer>
+        </alias>
+        <alias>
+                <family>monospace</family>
+                <prefer>
+                        <family>TlwgTypewriter</family>
+                </prefer>
+        </alias>
+        <match target="font">
+                <test name="family"><string>Loma</string></test>
+                <edit name="autohint" mode="assign"><bool>false</bool></edit>
+                <edit name="hinting" mode="assign"><bool>false</bool></edit>
+                <edit name="embeddedbitmap" mode="assign"><bool>false</bool></edit>
+        </match>
+        <match target="font">
+                <test name="family"><string>Garuda</string></test>
+                <edit name="autohint" mode="assign"><bool>false</bool></edit>
+                <edit name="hinting" mode="assign"><bool>false</bool></edit>
+                <edit name="embeddedbitmap" mode="assign"><bool>false</bool></edit>
+        </match>
+        <match target="font">
+                <test name="family"><string>Norasi</string></test>
+                <edit name="autohint" mode="assign"><bool>false</bool></edit>
+                <edit name="hinting" mode="assign"><bool>false</bool></edit>
+                <edit name="embeddedbitmap" mode="assign"><bool>false</bool></edit>
+        </match>
+        <match target="font">
+                <test name="family"><string>Kinari</string></test>
+                <edit name="autohint" mode="assign"><bool>false</bool></edit>
+                <edit name="hinting" mode="assign"><bool>false</bool></edit>
+                <edit name="embeddedbitmap" mode="assign"><bool>false</bool></edit>
+        </match>
+        <match target="font">
+                <test name="family"><string>Purisa</string></test>
+                <edit name="autohint" mode="assign"><bool>false</bool></edit>
+                <edit name="hinting" mode="assign"><bool>false</bool></edit>
+                <edit name="embeddedbitmap" mode="assign"><bool>false</bool></edit>
+        </match>
+        <match target="font">
+                <test name="family"><string>TlwgMono</string></test>
+                <edit name="autohint" mode="assign"><bool>false</bool></edit>
+                <edit name="hinting" mode="assign"><bool>false</bool></edit>
+                <edit name="embeddedbitmap" mode="assign"><bool>false</bool></edit>
+        </match>
+        <match target="font">
+                <test name="family"><string>TlwgTypewriter</string></test>
+                <edit name="autohint" mode="assign"><bool>false</bool></edit>
+                <edit name="hinting" mode="assign"><bool>false</bool></edit>
+                <edit name="embeddedbitmap" mode="assign"><bool>false</bool></edit>
+        </match>
+</fontconfig>

Modified: trunk/packages/fontconfig/Makefile
===================================================================
--- trunk/packages/fontconfig/Makefile	2007-02-24 13:09:35 UTC (rev 1816)
+++ trunk/packages/fontconfig/Makefile	2007-02-27 14:22:25 UTC (rev 1817)
@@ -1,13 +1,16 @@
 # Fontconfig Makefile
 
 NM= fontconfig
-VRS= 2.3.2
+VRS= 2.4.2
 DIR= $(NM)-$(VRS)
 
-FILE= $(DIR).tar.bz2
-URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE)
-SHA-$(FILE)= 89e67a477e6313aea7e55654fd5d9abdc1734bdd
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://www.fontconfig.org/release/$(FILE)
+SHA-$(FILE)= cd5e30625680a0435563b586275156eaf8d0d34a
 
+FILE1= 65-firefly.conf
+FILE2= 66-ttf-thai.conf
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -23,7 +26,9 @@
 	./configure --prefix=/usr --sysconfdir=/etc --disable-docs
 	make
 	make install
-	cp $(ROOT)/etc/fonts/{fonts,local}.conf /etc/fonts/
+	cp -v ../$(FILE1) ../$(FILE2) /etc/fonts/conf.avail
+	ln -sfv ../conf.avail/$(FILE1) ../conf.avail/$(FILE2) /etc/fonts/conf.d
+	cp -v ../local.conf /etc/fonts
 
 clean:
 	-rm -rf $(DIR)

Added: trunk/packages/fontconfig/local.conf
===================================================================
--- trunk/packages/fontconfig/local.conf	                        (rev 0)
+++ trunk/packages/fontconfig/local.conf	2007-02-27 14:22:25 UTC (rev 1817)
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/local.conf file for local customizations -->
+<fontconfig>
+<!--  Use the Autohinter instead of bytecode interpreter because European
+      fonts on the CD have poor native hints for non-ASCII characters -->
+  <match target="font">
+    <edit name="autohint" mode="assign"><bool>true</bool></edit>
+  </match>
+<!-- Use the embedded bitmaps in the AR PL New Sung font when appropriate -->
+  <match target="font">
+    <test name="family">
+      <string>AR PL New Sung</string>
+    </test>
+    <test name="pixelsize" compare="less_eq">
+      <double>16.0</double>
+    </test>
+    <edit name="antialias" mode="assign">
+      <bool>false</bool>
+    </edit>
+  </match>
+<!--
+  Enable sub-pixel rendering
+	<match target="font">
+		<test qual="all" name="rgba">
+			<const>unknown</const>
+		</test>
+		<edit name="rgba" mode="assign"><const>rgb</const></edit>
+	</match>
+-->
+</fontconfig>

Modified: trunk/packages/freetype/Makefile
===================================================================
--- trunk/packages/freetype/Makefile	2007-02-24 13:09:35 UTC (rev 1816)
+++ trunk/packages/freetype/Makefile	2007-02-27 14:22:25 UTC (rev 1817)
@@ -1,12 +1,12 @@
 # FreeType Makefile
 
 NM= freetype
-VRS= 2.1.10
+VRS= 2.3.1
 DIR= $(NM)-$(VRS)
 	 
 FILE= $(DIR).tar.bz2
-URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE)
-SHA-$(FILE)= f9e5c52e466c3e41483d5d6d44b4f3135a9c4b16
+URL-$(FILE)= http://easynews.dl.sourceforge.net/sourceforge/freetype/$(FILE)
+SHA-$(FILE)= f87c12c67abb5885486a248a1b83232877f074fe
 
 # Targets
 
@@ -21,7 +21,8 @@
 
 compile-stage2:
 	sed -i -r 's:.*(#.*BYTE.*) .*:\1:' include/freetype/config/ftoption.h
-	CFLAGS="$(CFLAGS) -fno-strict-aliasing" ./configure --prefix=/usr
+	sed -i '/define .*PATENT/s/define/undef/' include/freetype/config/ftoption.h
+	./configure --prefix=/usr
 	make
 	make install
 

Modified: trunk/packages/libdrm/Makefile
===================================================================
--- trunk/packages/libdrm/Makefile	2007-02-24 13:09:35 UTC (rev 1816)
+++ trunk/packages/libdrm/Makefile	2007-02-27 14:22:25 UTC (rev 1817)
@@ -1,12 +1,12 @@
 # libdrm Makefile
 
 NM= libdrm
-VRS= 2.0.2
+VRS= 2.3.0
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://dri.freedesktop.org/libdrm/$(FILE)
-SHA-$(FILE)= 99ed33bfd0fa41e8db0ad7d226f33f7546063a1a
+SHA-$(FILE)= af2e8d6e3ad6b906b4d6f1b2ada2d523188c28ea
 
 # Targets
 

Modified: trunk/packages/libpng/Makefile
===================================================================
--- trunk/packages/libpng/Makefile	2007-02-24 13:09:35 UTC (rev 1816)
+++ trunk/packages/libpng/Makefile	2007-02-27 14:22:25 UTC (rev 1817)
@@ -1,12 +1,12 @@
 # libpng Makefile
 
 NM= libpng
-VRS= 1.2.12
+VRS= 1.2.16
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://easynews.dl.sourceforge.net/libpng/$(FILE)
-SHA-$(FILE)= 44bd6821607ba09ac500279363871ad5974a01b5
+SHA-$(FILE)= 0b37d42d2ae33c22093d46a28e6b8fa21eb4c1da
 
 # Targets
 
@@ -26,7 +26,7 @@
 	# Stray symlink because we disable static libraries
 	rm -f /usr/lib/libpng.a
 	install -v -m755 -d /usr/share/doc/$(DIR)
-	install -v -m644 README libpng.txt /usr/share/doc/$(DIR)
+	install -v -m644 README libpng-$(VRS).txt /usr/share/doc/$(DIR)
 
 clean:
 	-rm -rf $(DIR)

Modified: trunk/packages/xorg-server/Makefile
===================================================================
--- trunk/packages/xorg-server/Makefile	2007-02-24 13:09:35 UTC (rev 1816)
+++ trunk/packages/xorg-server/Makefile	2007-02-27 14:22:25 UTC (rev 1817)
@@ -1,22 +1,21 @@
 # xorg-server Makefile
 
 NM= xorg-server
-VRS= 1.1.1
+VRS= 1.2.0
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://xorg.freedesktop.org/releases/individual/xserver/$(FILE)
-SHA-$(FILE)= eb29dd4fea9f184321cbb5512f68b674ada4daf7
+SHA-$(FILE)= 85fa0e8fa7d6bea6f1a73c66a57488ea68dffa17
 
-MESA_VRS= 6.5.1
+MESA_VRS= 6.5.2
 DIR1= Mesa-$(MESA_VRS)
 
 FILE1= MesaLib-$(MESA_VRS).tar.bz2
 URL-$(FILE1)= http://heanet.dl.sourceforge.net/sourceforge/mesa3d/$(FILE1)
-SHA-$(FILE1)= cd3b314808534b0306c7f89e9a72c9c23dbff239
+SHA-$(FILE1)= ba860bb6ee57c02202342dfd5927464a068ea18f
 
-PATCH1= xorg_server-1.1.1-dotclock-1.patch
-PATCH2= xorg_server-1.1.1-newmesa-1.patch
+PATCH1= xorg_server-$(VRS)-dotclock-1.patch
 
 # Targets
 
@@ -34,8 +33,6 @@
 	sed -i -e '/DPI/s,75,92,' hw/xfree86/common/xf86Priv.h hw/dmx/dmxinit.c
 	sed -i -e 's,#ifdef KDRIVESERVER,#if 1,' dix/dixfonts.c
 	patch -Np1 -i ../$(PATCH1)
-	patch -Np1 -i ../$(PATCH2)
-	autoreconf --force --install --verbose
 	./configure --prefix=/usr --datadir=/usr/share --sysconfdir=/etc --localstatedir=/var \
 	    --with-mesa-source=`pwd`/$(DIR1) --with-default-font-path=built-ins \
 	    --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb

Deleted: trunk/packages/xorg-server/xorg_server-1.1.1-dotclock-1.patch
===================================================================
--- trunk/packages/xorg-server/xorg_server-1.1.1-dotclock-1.patch	2007-02-24 13:09:35 UTC (rev 1816)
+++ trunk/packages/xorg-server/xorg_server-1.1.1-dotclock-1.patch	2007-02-27 14:22:25 UTC (rev 1817)
@@ -1,59 +0,0 @@
-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.1.1.orig/hw/xfree86/common/xf86Mode.c xorg-server-X11R7.0-1.1.1/hw/xfree86/common/xf86Mode.c
---- xorg-server-X11R7.0-1.1.1.orig/hw/xfree86/common/xf86Mode.c	2005-07-03 14:53:42.000000000 +0600
-+++ xorg-server-X11R7.0-1.1.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);
-+		if (mon_range->max_clock > 0) return MODE_CLOCK_HIGH;
- 	    }
- 	}
-     }
-diff -ur xorg-server-X11R7.0-1.1.1.orig/hw/xfree86/common/extramodes xorg-server-X11R7.0-1.1.1/hw/xfree86/common/extramodes
---- xorg-server-X11R7.0-1.1.1.orig/hw/xfree86/common/extramodes	2004-04-24 01:53:57.000000000 +0600
-+++ xorg-server-X11R7.0-1.1.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.1.1.orig/hw/xfree86/common/vesamodes xorg-server-X11R7.0-1.1.1/hw/xfree86/common/vesamodes
---- xorg-server-X11R7.0-1.1.1.orig/hw/xfree86/common/vesamodes	2004-04-24 01:53:57.000000000 +0600
-+++ xorg-server-X11R7.0-1.1.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
- 

Deleted: trunk/packages/xorg-server/xorg_server-1.1.1-newmesa-1.patch
===================================================================
--- trunk/packages/xorg-server/xorg_server-1.1.1-newmesa-1.patch	2007-02-24 13:09:35 UTC (rev 1816)
+++ trunk/packages/xorg-server/xorg_server-1.1.1-newmesa-1.patch	2007-02-27 14:22:25 UTC (rev 1817)
@@ -1,51 +0,0 @@
---- xorg-server-1.1.1/GL/symlink-mesa.sh	2006-07-05 18:38:46.000000000 +0000
-+++ xorg-server-1.1.1.new/GL/symlink-mesa.sh	2006-10-17 14:58:43.000000000 +0000
-@@ -88,8 +88,11 @@
-     action api_noop.h
-     action api_validate.c
-     action api_validate.h
-+    action arrayobj.c
-+    action arrayobj.h
-     action attrib.c
-     action attrib.h
-+    action bitset.h
-     action blend.c
-     action blend.h
-     action bufferobj.c
-@@ -168,6 +171,8 @@
-     action polygon.h
-     action rastpos.c
-     action rastpos.h
-+    action rbadaptors.c
-+    action rbadaptors.h
-     action renderbuffer.c
-     action renderbuffer.h
-     action simple_list.h
-@@ -462,8 +467,8 @@
-     action slang_common_builtin_gc.h
-     action slang_core_gc.h
-     action slang_fragment_builtin_gc.h
-+    action slang_pp_version_syn.h
-     action slang_shader_syn.h
--    action slang_version_syn.h
-     action slang_vertex_builtin_gc.h
- }        
- 
---- xorg-server-1.1.1/GL/mesa/main/Makefile.am	2006-07-05 18:38:46.000000000 +0000
-+++ xorg-server-1.1.1.new/GL/mesa/main/Makefile.am	2006-10-17 14:33:06.000000000 +0000
-@@ -29,6 +29,7 @@
-                     api_loopback.c \
-                     api_noop.c \
-                     api_validate.c \
-+                    arrayobj.c \
-                     attrib.c \
-                     blend.c \
-                     bufferobj.c \
-@@ -67,6 +68,7 @@
-                     points.c \
-                     polygon.c \
-                     rastpos.c \
-+                    rbadaptors.c \
-                     renderbuffer.c \
-                     state.c \
-                     stencil.c \

Copied: trunk/packages/xorg-server/xorg_server-1.2.0-dotclock-1.patch (from rev 1815, trunk/packages/xorg-server/xorg_server-1.1.1-dotclock-1.patch)
===================================================================
--- trunk/packages/xorg-server/xorg_server-1.2.0-dotclock-1.patch	                        (rev 0)
+++ trunk/packages/xorg-server/xorg_server-1.2.0-dotclock-1.patch	2007-02-27 14:22:25 UTC (rev 1817)
@@ -0,0 +1,43 @@
+Submitted By: Alexander E. Patrakov
+Date: 2007-02-27
+Initial Package Version: 1.2.0
+Origin: Alexander E. Patrakov
+Upstream status: LiveCD specific
+Description: Deletes default modes with refresh rate less than 60 Hz
+
+diff -ur xorg-server-X11R7.0-1.1.1.orig/hw/xfree86/common/extramodes xorg-server-X11R7.0-1.1.1/hw/xfree86/common/extramodes
+--- xorg-server-X11R7.0-1.1.1.orig/hw/xfree86/common/extramodes	2004-04-24 01:53:57.000000000 +0600
++++ xorg-server-X11R7.0-1.1.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.1.1.orig/hw/xfree86/common/vesamodes xorg-server-X11R7.0-1.1.1/hw/xfree86/common/vesamodes
+--- xorg-server-X11R7.0-1.1.1.orig/hw/xfree86/common/vesamodes	2004-04-24 01:53:57.000000000 +0600
++++ xorg-server-X11R7.0-1.1.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
+ 




More information about the livecd mailing list