[Lunar-commits] r21234 - moonbase/branches/crater/xgl/xgl-cvs

[Samuel Verstraete]

Author: elangelo
Date: 2006-09-02 09:46:00 +0000 (Sat, 02 Sep 2006)
New Revision: 21234

Modified:
   moonbase/branches/crater/xgl/xgl-cvs/BUILD
   moonbase/branches/crater/xgl/xgl-cvs/DETAILS
   moonbase/branches/crater/xgl/xgl-cvs/PRE_BUILD
Log:
evil hack
gr,S.


Modified: moonbase/branches/crater/xgl/xgl-cvs/BUILD
===================================================================
--- moonbase/branches/crater/xgl/xgl-cvs/BUILD	2006-09-02 06:01:14 UTC (rev 21233)
+++ moonbase/branches/crater/xgl/xgl-cvs/BUILD	2006-09-02 09:46:00 UTC (rev 21234)
@@ -1,12 +1,8 @@
 (
+  git checkout -f xgl-0-0-1
   . /etc/profile.d/x11r7.rc &&
-   cd xorg &&
-   libtoolize --force &&
-   aclocal -I /usr/X11/share/aclocal/ &&
-   autoconf &&
-   autoheader &&
-   automake --add-missing --gnu &&
-   patch -p 1 -i ${SCRIPT_DIRECTORY}/xgl-xinerama.patch &&
+#  cd xorg &&
+#  patch -p 1 -i ${SCRIPT_DIRECTORY}/xgl-xinerama.patch &&
    ./autogen.sh --build=$BUILD                                  \
                 --libdir=/usr/lib                               \
                 --prefix=${X11R7_PREFIX:-/usr}                  \
@@ -18,7 +14,7 @@
                 --disable-xprint                                \
                 --enable-glx                                    \
                 --enable-dri                                    \
-                --with-mesa-source=${BUILD_DIRECTORY}/Mesa \
+	        --with-mesa-source=/usr/src/Mesa                \
                 --disable-xvfb                                  \
                 --disable-xnest                                 \
                 --enable-xglx                                   \

Modified: moonbase/branches/crater/xgl/xgl-cvs/DETAILS
===================================================================
--- moonbase/branches/crater/xgl/xgl-cvs/DETAILS	2006-09-02 06:01:14 UTC (rev 21233)
+++ moonbase/branches/crater/xgl/xgl-cvs/DETAILS	2006-09-02 09:46:00 UTC (rev 21234)
@@ -1,11 +1,14 @@
-          MODULE=xgl-cvs
+          MODULE=xgl-git
              MOD=xserver
-         VERSION=cvs
+         VERSION=git
           SOURCE=$MOD.tar.bz2
          SOURCE2=Mesa.tar.bz2
-      SOURCE_URL=cvs://:pserver:anonymous@anoncvs.freedesktop.org:/cvs/xorg:xserver:xgl-0-0-1
-      SOURCE2_URL=http://merlin.ugent.be/lunar
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD
+      SOURCE_URL=git://anongit.freedesktop.org/xorg/xserver
+#     SOURCE_URL=cvs://:pserver:anonymous@anoncvs.freedesktop.org:/cvs/xorg:xserver:xgl-0-0-1
+      SOURCE2_URL=cvs://:pserver:anonymous@anoncvs.freedesktop.org:/cvs/mesa:Mesa
+#     SOURCE2_URL=git://anongit.freedesktop.org/mesa
+#     SOURCE2_URL=http://merlin.ugent.be/lunar
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
         WEB_SITE=http://www.freedesktop.org/wiki/Software/Xgl
          ENTERED=20060531
          UPDATED=`date -u +%Y%m%d`

Modified: moonbase/branches/crater/xgl/xgl-cvs/PRE_BUILD
===================================================================
--- moonbase/branches/crater/xgl/xgl-cvs/PRE_BUILD	2006-09-02 06:01:14 UTC (rev 21233)
+++ moonbase/branches/crater/xgl/xgl-cvs/PRE_BUILD	2006-09-02 09:46:00 UTC (rev 21234)
@@ -1,3 +1,6 @@
 default_pre_build 	&&
 cd $BUILD_DIRECTORY 	&&
-unpack $SOURCE2
+unpack $SOURCE2         &&
+# http://lists.freedesktop.org/archives/xorg/2006-August/017735.html
+ln -s Mesa/src/mesa/shader/slang/library/slang_pp_version.syn Mesa/src/mesa/shader/slang/library/slang_version.syn
+ln -s Mesa/src/mesa/shader/slang/library/slang_pp_version_syn.h Mesa/src/mesa/shader/slang/library/slang_version_syn.h