egl/wayland: Use MIN2 for wl_drm version

[mesa.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index db3cb9517fe89e9edd02027c81bacf9c73b252e2..fa52bf96f1609940b5291ee9740a0909fa2bedb9 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ matrix:
     - env:
         - LABEL="make loaders/classic DRI"
         - BUILD=make
-        - MAKEFLAGS=-j2
+        - MAKEFLAGS="-j4"
         - MAKE_CHECK_COMMAND="make check"
         - DRI_LOADERS="--enable-glx --enable-gbm --enable-egl --with-platforms=x11,drm,surfaceless,wayland --enable-osmesa"
         - DRI_DRIVERS="i915,i965,radeon,r200,swrast,nouveau"
@@ -45,18 +45,20 @@ matrix:
             - x11proto-xf86vidmode-dev
             - libexpat1-dev
             - libx11-xcb-dev
+            - libxdamage-dev
+            - libxfixes-dev
     - env:
         # NOTE: Building SWR is 2x (yes two) times slower than all the other
         # gallium drivers combined.
         # Start this early so that it doesn't hunder the run time.
         - LABEL="make Gallium Drivers SWR"
         - BUILD=make
-        - MAKEFLAGS=-j2
+        - MAKEFLAGS="-j4"
         - MAKE_CHECK_COMMAND="true"
         - LLVM_VERSION=3.9
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-        - OVERRIDE_CC="gcc-5"
-        - OVERRIDE_CXX="g++-5"
+        - OVERRIDE_CC="gcc-4.8"
+        - OVERRIDE_CXX="g++-4.8"
         - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
         - DRI_DRIVERS=""
         - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
@@ -65,13 +67,11 @@ matrix:
       addons:
         apt:
           sources:
-            - ubuntu-toolchain-r-test
             - llvm-toolchain-trusty-3.9
           packages:
             # LLVM packaging is broken and misses these dependencies
             - libedit-dev
             # From sources above
-            - g++-5
             - llvm-3.9-dev
             # Common
             - xz-utils
@@ -82,14 +82,14 @@ matrix:
     - env:
         - LABEL="make Gallium Drivers Other"
         - BUILD=make
-        - MAKEFLAGS=-j2
+        - MAKEFLAGS="-j4"
         - MAKE_CHECK_COMMAND="true"
         - LLVM_VERSION=3.9
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
         - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
         - DRI_DRIVERS=""
         - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
-        - GALLIUM_DRIVERS="i915,nouveau,r300,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,etnaviv,imx"
+        - GALLIUM_DRIVERS="i915,nouveau,pl111,r300,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,etnaviv,imx"
         - VULKAN_DRIVERS=""
       addons:
         apt:
@@ -110,7 +110,7 @@ matrix:
         # NOTE: Analogous to SWR above, building Clover is quite slow.
         - LABEL="make Gallium ST Clover"
         - BUILD=make
-        - MAKEFLAGS=-j2
+        - MAKEFLAGS="-j4"
         - MAKE_CHECK_COMMAND="true"
         - LLVM_VERSION=3.6
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
@@ -145,7 +145,7 @@ matrix:
     - env:
         - LABEL="make Gallium ST Other"
         - BUILD=make
-        - MAKEFLAGS=-j2
+        - MAKEFLAGS="-j4"
         - MAKE_CHECK_COMMAND="true"
         - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
         - DRI_DRIVERS=""
@@ -175,16 +175,13 @@ matrix:
     - env:
         - LABEL="make Vulkan"
         - BUILD=make
-        - MAKEFLAGS=-j2
+        - MAKEFLAGS="-j4"
         - MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel check"
         - LLVM_VERSION=3.9
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-        # XXX: we want to test the WSI, but those are enabled via the EGL toggles
-        # XXX: Platform X11 dependencies are checked when --enable-glx is set
-        - DRI_LOADERS="--enable-glx --disable-gbm --enable-egl --with-platforms=x11,wayland"
+        - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl --with-platforms=x11,wayland"
         - DRI_DRIVERS=""
-        # XXX: enable DRI for EGL above
-        - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
+        - GALLIUM_ST="--enable-dri --enable-dri3 --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
         - GALLIUM_DRIVERS=""
         - VULKAN_DRIVERS="intel,radeon"
       addons:
@@ -251,19 +248,17 @@ matrix:
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
         # Keep it symmetrical to the make build. There's no actual SWR, yet.
         - SCONS_CHECK_COMMAND="true"
-        - OVERRIDE_CC="gcc-5"
-        - OVERRIDE_CXX="g++-5"
+        - OVERRIDE_CC="gcc-4.8"
+        - OVERRIDE_CXX="g++-4.8"
       addons:
         apt:
           sources:
-            - ubuntu-toolchain-r-test
             - llvm-toolchain-trusty-3.9
           packages:
             - scons
             # LLVM packaging is broken and misses these dependencies
             - libedit-dev
             # From sources above
-            - g++-5
             - llvm-3.9-dev
             # Common
             - xz-utils