use binary mesa on travis to speed up build times

This commit is contained in:
Konstantin Käfer
2014-10-31 08:30:55 -07:00
committed by Konstantin Käfer
parent 86230821e4
commit 38d17532c6
3 changed files with 8 additions and 22 deletions

View File

@@ -29,6 +29,7 @@ before_install:
- source ./scripts/flags.sh
- (git clone https://github.com/mapbox/mason.git ~/.mason ; sudo ln -s ~/.mason/mason /usr/local/bin/mason)
- ./scripts/travis_before_install.sh
- if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi
- if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then glxinfo; fi
install:

View File

@@ -38,7 +38,6 @@
#else
#define GL_GLEXT_PROTOTYPES
#include <GL/gl.h>
#include <GL/glu.h>
#include <GL/glext.h>
#endif

View File

@@ -24,30 +24,16 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
libboost1.55-dev libcurl4-openssl-dev \
libpng-dev libsqlite3-dev
mapbox_time "install_mesa_deps" \
sudo apt-get install -y libpthread-stubs0-dev \
xserver-xorg-dev x11proto-xinerama-dev libx11-xcb-dev \
libxcb-glx0-dev libxrender-dev llvm-3.4 mesa-utils && \
sudo apt-get build-dep -y libgl1-mesa-dri libxcb-glx0-dev
mapbox_time "build_mesa" \
curl -sfo MesaLib-10.3.1.tar.gz http://ftp.de.debian.org/debian/pool/main/m/mesa/mesa_10.3.1.orig.tar.gz && \
tar -zxf MesaLib-10.3.1.tar.gz && \
cd Mesa-10.3.1 && \
./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \
--enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 \
--without-va && \
echo $CXXFLAGS
echo $CFLAGS
echo $LDFLAGS
make -j$JOBS && sudo make install && \
cd ../
mapbox_time "install_opengl" \
sudo apt-get -y install libxi-dev x11proto-randr-dev \
sudo apt-get -y install mesa-utils libxi-dev x11proto-randr-dev \
x11proto-xext-dev libxrandr-dev \
x11proto-xf86vidmode-dev libxxf86vm-dev \
libxcursor-dev libxinerama-dev
libxcursor-dev libxinerama-dev \
llvm-3.4 # required for mesa
mapbox_time "install_mesa" \
mason install mesa 10.3.1
mapbox_time "install_awscli" \
sudo pip install awscli