From 4c3debb9d7c4b99e0809a1f0204059ecc255a6d9 Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Mon, 20 Oct 2014 16:52:16 -0400 Subject: [PATCH] glxinfo in main process, build libva from source --- .travis.yml | 1 + scripts/travis_before_install.sh | 18 +++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index edcd19565..fa5bec468 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ before_install: - source ./scripts/travis_helper.sh - source ./scripts/flags.sh - ./scripts/travis_before_install.sh +- if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then glxinfo; fi install: - make setup diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index c25caa9d0..24acce0bc 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -24,22 +24,26 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then 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 libtsan0 \ - mesa-utils && \ + 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_libva" \ + sudo apt-get install -y libgl1-mesa-dev libpciaccess-dev libdrm-dev \ + libXfixes-dev libXext-dev && \ + git clone git://anongit.freedesktop.org/git/vaapi/libva && \ + cd libva && \ + ./autogen.sh && \ + make && sudo make install && \ + cd ../ + mapbox_time "build_mesa" \ git clone git://anongit.freedesktop.org/git/mesa/mesa && \ cd mesa && \ ./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \ - --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 \ - --disable-va && \ + --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 && \ make && sudo make install && \ cd ../ - mapbox_time "glxinfo" \ - glxinfo - mapbox_time "install_opengl" \ sudo apt-get -y install libxi-dev x11proto-randr-dev \ x11proto-xext-dev libxrandr-dev \