[Lunar-commits] r18338 - moonbase/trunk/x11/XOrg

[Terry Chan]

Author: tchan
Date: 2006-01-25 18:46:22 +0000 (Wed, 25 Jan 2006)
New Revision: 18338

Modified:
   moonbase/trunk/x11/XOrg/BUILD
   moonbase/trunk/x11/XOrg/DETAILS
   moonbase/trunk/x11/XOrg/PRE_BUILD
Log:
Version bump to XOrg-6.9.0. Compiled/tested with gcc-3.4.5, glibc-2.3.6,
kernel headers 2.4.x. NOTE: fglrx will NO longer work until ATI releases
a version for XOrg-6.9 or XOrg-7.0 (since 6.9 is really 7.0 in disguise, sshhh :)
So the changes I had to make to my /etc/X11/xorg.conf wer to use
the radeon XOrg driver instead of fglrx, and disable dri and glx. No big loss
for me, YMMV.


Modified: moonbase/trunk/x11/XOrg/BUILD
===================================================================
--- moonbase/trunk/x11/XOrg/BUILD	2006-01-25 16:49:29 UTC (rev 18337)
+++ moonbase/trunk/x11/XOrg/BUILD	2006-01-25 18:46:22 UTC (rev 18338)
@@ -53,7 +53,7 @@
     invoke_installwatch
   fi
 
-  patch_it $SOURCE_CACHE/$SOURCE4 1  &&
+# patch_it $SOURCE_CACHE/$SOURCE4 1  &&
   
   # explicitly exit here now and not later on
   make World || exit 1

Modified: moonbase/trunk/x11/XOrg/DETAILS
===================================================================
--- moonbase/trunk/x11/XOrg/DETAILS	2006-01-25 16:49:29 UTC (rev 18337)
+++ moonbase/trunk/x11/XOrg/DETAILS	2006-01-25 18:46:22 UTC (rev 18338)
@@ -1,9 +1,9 @@
           MODULE=XOrg
-         VERSION=6.8.2
+         VERSION=6.9.0
           SOURCE=X11R${VERSION}-src1.tar.gz
          SOURCE2=X11R${VERSION}-src2.tar.gz
          SOURCE3=X11R${VERSION}-src3.tar.gz
-         SOURCE4=$MODULE-$VERSION-gcc4.patch.bz2
+#        SOURCE4=$MODULE-$VERSION-gcc4.patch.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/xc
    SOURCE_URL[0]=http://xorg.freedesktop.org/X11R${VERSION}/src/
    SOURCE_URL[1]=http://ftp.skynet.be/pub/ftp.x.org/pub/X11R${VERSION}/src/
@@ -14,14 +14,14 @@
   SOURCE3_URL[0]=http://xorg.freedesktop.org/X11R${VERSION}/src/
   SOURCE3_URL[1]=http://ftp.skynet.be/pub/ftp.x.org/pub/X11R${VERSION}/src/
   SOURCE3_URL[2]=http://www.mirrormonster.com/ftp.x.org/pub/X11R${VERSION}/src/
-  SOURCE4_URL[0]=$PATCH_URL/
-      SOURCE_VFY=sha1:23c60680274062a1db17f646a8388149309dc45c
-     SOURCE2_VFY=sha1:af6190fd2619cc60e70c0a8c00dee6826e1fb726
-     SOURCE3_VFY=sha1:de1569856b8023c58fc92bd0b3c8406214451fce
-     SOURCE4_VFY=sha1:cace4f15fcbbdc26c68e719af9f5e6feae4716e5
+# SOURCE4_URL[0]=$PATCH_URL/
+      SOURCE_VFY=sha1:a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
+     SOURCE2_VFY=sha1:9aa8f222c141c735656305945da3cad3b7f33101
+     SOURCE3_VFY=sha1:0c8a0d6f9471ec022e12e2688d1991c985a1efb2
+#    SOURCE4_VFY=sha1:cace4f15fcbbdc26c68e719af9f5e6feae4716e5
         WEB_SITE=http://xorg.freedesktop.org
          ENTERED=20040325
-         UPDATED=20050411
+         UPDATED=20060125
            SHORT="XOrg is the Open Source Public Implementation of X11"
            PSAFE=no
 

Modified: moonbase/trunk/x11/XOrg/PRE_BUILD
===================================================================
--- moonbase/trunk/x11/XOrg/PRE_BUILD	2006-01-25 16:49:29 UTC (rev 18337)
+++ moonbase/trunk/x11/XOrg/PRE_BUILD	2006-01-25 18:46:22 UTC (rev 18338)
@@ -1,5 +1,3 @@
-validate_source_dir $SOURCE_DIRECTORY   &&
-mk_source_dir       $SOURCE_DIRECTORY   &&
-unpack              $SOURCE             
-unpack              $SOURCE2            &&
-unpack              $SOURCE3
+unpack $SOURCE  && 
+unpack $SOURCE2 &&
+unpack $SOURCE3