X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.travis.yml;h=4ef0286a68f3a4c180e26f108cbdabd873d590af;hb=45b5f5fa25b844bab458369a50f7423724dc4283;hp=9e45eca8d644e8f41bb86d04ce167de735ffd502;hpb=80f937ea4db301f5cf53691532a65a8c660e57d4;p=mesa.git

diff --git a/.travis.yml b/.travis.yml
index 9e45eca8d64..4ef0286a68f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,18 +35,20 @@ matrix:
     - env:
         - LABEL="meson Vulkan"
         - BUILD=meson
-        - MESON_OPTIONS="-Ddri-drivers=[] -Dgallium-drivers=[]"
-        - LLVM_VERSION=5.0
+        - DRI_DRIVERS=""
+        - GALLIUM_DRIVERS=""
+        - VULKAN_DRIVERS="intel,amd"
+        - LLVM_VERSION=6.0
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
       addons:
         apt:
           sources:
-            - llvm-toolchain-trusty-5.0
+            - llvm-toolchain-trusty-6.0
+            # llvm-6 requires libstdc++4.9 which is not in main repo
+            - ubuntu-toolchain-r-test
           packages:
-            # LLVM packaging is broken and misses these dependencies
-            - libedit-dev
             # From sources above
-            - llvm-5.0-dev
+            - llvm-6.0-dev
             # Common
             - xz-utils
             - libexpat1-dev
@@ -55,7 +57,9 @@ matrix:
     - env:
         - LABEL="meson loaders/classic DRI"
         - BUILD=meson
-        - MESON_OPTIONS="-Dvulkan-drivers=[] -Dgallium-drivers=[]"
+        - DRI_DRIVERS="i915,i965,r100,r200,swrast,nouveau"
+        - GALLIUM_DRIVERS=""
+        - VULKAN_DRIVERS=""
       addons:
         apt:
           packages:
@@ -86,6 +90,7 @@ matrix:
             - libx11-xcb-dev
             - libxdamage-dev
             - libxfixes-dev
+            - python3-pip
     - env:
         # NOTE: Building SWR is 2x (yes two) times slower than all the other
         # gallium drivers combined.
@@ -94,10 +99,8 @@ matrix:
         - BUILD=make
         - MAKEFLAGS="-j4"
         - MAKE_CHECK_COMMAND="true"
-        - LLVM_VERSION=5.0
+        - LLVM_VERSION=6.0
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-        - 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-bellagio --disable-gallium-osmesa"
@@ -107,12 +110,12 @@ matrix:
       addons:
         apt:
           sources:
-            - llvm-toolchain-trusty-5.0
+            - llvm-toolchain-trusty-6.0
+            # llvm-6 requires libstdc++4.9 which is not in main repo
+            - ubuntu-toolchain-r-test
           packages:
-            # LLVM packaging is broken and misses these dependencies
-            - libedit-dev
             # From sources above
-            - llvm-5.0-dev
+            - llvm-6.0-dev
             # Common
             - xz-utils
             - x11proto-xf86vidmode-dev
@@ -120,6 +123,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         - LABEL="make Gallium Drivers RadeonSI"
         - BUILD=make
@@ -137,11 +141,9 @@ matrix:
         apt:
           sources:
             - llvm-toolchain-trusty-6.0
-            # llvm-6 depends on gcc-4.9 which is not in main repo
+            # llvm-6 requires libstdc++4.9 which is not in main repo
             - ubuntu-toolchain-r-test
           packages:
-            # LLVM packaging is broken and misses these dependencies
-            - libedit-dev
             # From sources above
             - llvm-6.0-dev
             # Common
@@ -151,6 +153,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         - LABEL="make Gallium Drivers Other"
         - BUILD=make
@@ -183,6 +186,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         # NOTE: Analogous to SWR above, building Clover is quite slow.
         - LABEL="make Gallium ST Clover LLVM-3.9"
@@ -222,6 +226,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         # NOTE: Analogous to SWR above, building Clover is quite slow.
         - LABEL="make Gallium ST Clover LLVM-4.0"
@@ -258,6 +263,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         # NOTE: Analogous to SWR above, building Clover is quite slow.
         - LABEL="make Gallium ST Clover LLVM-5.0"
@@ -294,6 +300,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         # NOTE: Analogous to SWR above, building Clover is quite slow.
         - LABEL="make Gallium ST Clover LLVM-6.0"
@@ -312,7 +319,7 @@ matrix:
         apt:
           sources:
             - llvm-toolchain-trusty-6.0
-            # llvm-6 depends on gcc-4.9 which is not in main repo
+            # llvm-6 requires libstdc++4.9 which is not in main repo
             - ubuntu-toolchain-r-test
           packages:
             - libclc-dev
@@ -327,6 +334,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         - LABEL="make Gallium ST Other"
         - BUILD=make
@@ -363,6 +371,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         - LABEL="make Vulkan"
         - BUILD=make
@@ -380,11 +389,9 @@ matrix:
         apt:
           sources:
             - llvm-toolchain-trusty-6.0
-            # llvm-6 depends on gcc-4.9 which is not in main repo
+            # llvm-6 requires libstdc++4.9 which is not in main repo
             - ubuntu-toolchain-r-test
           packages:
-            # LLVM packaging is broken and misses these dependencies
-            - libedit-dev
             # From sources above
             - llvm-6.0-dev
             # Common
@@ -393,6 +400,7 @@ matrix:
             - libexpat1-dev
             - libx11-xcb-dev
             - libelf-dev
+            - python3-pip
     - env:
         - LABEL="scons"
         - BUILD=scons
@@ -436,21 +444,19 @@ matrix:
         - BUILD=scons
         - SCONSFLAGS="-j4"
         - SCONS_TARGET="swr=1"
-        - LLVM_VERSION=5.0
+        - LLVM_VERSION=6.0
         - 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-4.8"
-        - OVERRIDE_CXX="g++-4.8"
       addons:
         apt:
           sources:
-            - llvm-toolchain-trusty-5.0
+            - llvm-toolchain-trusty-6.0
+            # llvm-6 requires libstdc++4.9 which is not in main repo
+            - ubuntu-toolchain-r-test
           packages:
-            # LLVM packaging is broken and misses these dependencies
-            - libedit-dev
             # From sources above
-            - llvm-5.0-dev
+            - llvm-6.0-dev
             # Common
             - xz-utils
             - x11proto-xf86vidmode-dev
@@ -467,7 +473,6 @@ matrix:
     - env:
         - LABEL="macOS meson"
         - BUILD=meson
-        - MESON_OPTIONS="-Degl=false"
       os: osx
 
 before_install:
@@ -494,18 +499,23 @@ before_install:
     fi
 
 install:
-  - pip2 install --user mako
-
   # Install a more modern meson from pip, since the version in the
   # ubuntu repos is often quite old. Avoid >=0.45.0 as it needs python
   # 3.5+
   - if test "x$BUILD" = xmeson; then
       pip3 install --user "meson<0.45.0";
+      pip3 install --user mako;
+    fi
+
+  # Install autotools build dependencies
+  - if test "x$BUILD" = xmake; then
+      pip3 install --user mako;
     fi
 
   # Install a more modern scons from pip.
   - if test "x$BUILD" = xscons; then
       pip2 install --user "scons>=2.4";
+      pip2 install --user mako;
     fi
 
   # Since libdrm gets updated in configure.ac regularly, try to pick up the
@@ -651,6 +661,14 @@ script:
   - |
     if test "x$BUILD" = xmeson; then
 
+      if test "x$TRAVIS_OS_NAME" == xosx; then
+        MESON_OPTIONS="-Degl=false"
+      fi
+
+      if test "x$TRAVIS_OS_NAME" == xlinux; then
+        MESON_OPTIONS="-Ddri-drivers=${DRI_DRIVERS:-[]} -Dgallium-drivers=${GALLIUM_DRIVERS:-[]} -Dvulkan-drivers=${VULKAN_DRIVERS:-[]}"
+      fi
+
       # Travis CI has moved to LLVM 5.0, and meson is detecting
       # automatically the available version in /usr/local/bin based on
       # the PATH env variable order preference.