From 38d17532c672a213d9c7a7fc184b32c80c0df517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Fri, 31 Oct 2014 08:30:55 -0700 Subject: [PATCH] use binary mesa on travis to speed up build times --- .travis.yml | 1 + include/mbgl/platform/gl.hpp | 1 - scripts/travis_before_install.sh | 28 +++++++--------------------- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6336eae02..8edbe3c15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/include/mbgl/platform/gl.hpp b/include/mbgl/platform/gl.hpp index cc2a681d4..d5162f2c7 100644 --- a/include/mbgl/platform/gl.hpp +++ b/include/mbgl/platform/gl.hpp @@ -38,7 +38,6 @@ #else #define GL_GLEXT_PROTOTYPES #include - #include #include #endif diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index f67aa270d..2af2f7ae0 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -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