Move xvfb. Add llvmpipe.so.

third_party/xvfb/building/then-build

 #!/bin/sh
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 PPATH=/usr/lib/pkgconfig
 LPATH="$(pwd)"
 export PKG_CONFIG_PATH="${LPATH}"/lib/pkgconfig:"${PPATH}"
+export PATH="${LPATH}/bin:${PATH}"
 
 # Print an early message about what we think we're building.
 # Informative only, if this fails, comment it out.
 arch=$(python -c 'import platform; print platform.architecture()[0]')
-echo "Builiding for $arch ..."
+echo "Building for $arch ..."
+
+PKGS="util-macros-1.11.0 xproto-7.0.20 xcb-proto-1.6 libXfont-1.4.3 \
+    dri2proto-2.3 libxkbfile-1.0.7 libdrm-2.4.26 libXmu-1.0.5"
 
 rm -f .xorg.stop
-for p in util-macros-1.11.0 xproto-7.0.20 xcb-proto-1.6 libXfont-1.4.3 \
-         dri2proto-2.3 libxkbfile-1.0.7 libdrm-2.4.26 \
-         libXmu-1.0.5 ; do
+for p in ${PKGS} ; do
   if [ -f $p.succeeded ] ; then
     echo $p already done
   else
     tar xzf ../$p.tar.gz 
     if [ -f $p/configure ] ; then
       ( cd $p && ./configure --prefix="$LPATH" --exec_prefix="$LPATH" && \
         make && make install ) >$p.output 2>&1 && mv $p.output $p.succeeded
     else
       ( cd $p && ./autogen.sh --prefix="$LPATH" --exec_prefix="$LPATH" && \
         make && make install ) >$p.output 2>&1 && mv $p.output $p.succeeded
     fi
     if [ -f $p.succeeded ] ; then
       echo $p done
     else
       echo $p FAILED ; tail -80 $p.output ; echo $p FAILED
       touch .xorg.stop
       break
     fi
   fi
 done
 
-mv=7.11
+mv=${MESA_VER-8.0.1}
 p=Mesa-${mv}
 
 if [ -f $p.succeeded ] ; then
     echo $p already done
 else
-  tar xzf ../MesaGLUT-${mv}.tar.gz
+  [ -d lib ] || mkdir lib

[Peter Mayo, 2012/03/05 21:11:51]

perhaps 'mkdir -p lib'

   tar xzf ../MesaLib-${mv}.tar.gz
-  ( cd $p &&  ./configure --prefix="$LPATH" --exec_prefix="$LPATH" \
-                          --with-gallium-drivers= --with-dri-drivers= && \
+  ( cd $p && \
+    ./configure --prefix="$LPATH" --exec_prefix="$LPATH" \
+                --with-driver=xlib \
+                --with-gallium-drivers=swrast --with-dri-drivers= && \
     make && make install ) >$p.output 2>&1 && mv $p.output $p.succeeded
   if [ -f $p.succeeded ] ; then
     echo $p done
+    cp $p/lib/gallium/libGL.so lib/libllvmpipe.so
+    echo llvmpipe.so built for $arch
   else
     echo $p FAILED ; tail -80 $p.output ; echo $p FAILED
     touch .xorg.stop
   fi
 fi
 
 
 #
 # The builders are wilder/older versions of linux.  pixman is missing a
 # referenced symbol on Hardy.  Xfont fails to read the fonts, and it has
@@ skipping 36 matching lines @@
     ( cd glx && make ) && \
     ( cd hw/vfb && make Xvfb && makeXvfbMoreStatically ) ) >$p.output 2>&1 && \
     mv $p.output $p.succeeded
   if [ -f $p.succeeded ] ; then
     cp $p/hw/vfb/Xvfb bin/.
     echo "Built Xvfb for $arch sucessfully."
   else 
     echo $p FAILED ; tail -80 $p.output ; echo $p FAILED \; see $p.output
   fi
 fi