diff options
| author | Jan Vesely <[email protected]> | 2018-05-17 21:32:56 -0400 |
|---|---|---|
| committer | Jan Vesely <[email protected]> | 2018-05-18 13:59:37 -0400 |
| commit | 8ed2cabd04c4697802f4d275f839640826e462ee (patch) | |
| tree | 8152ff3aa811e305674e59722dfbd7e6faf8daa0 | |
| parent | 3d64ed57853d59d602789c45b041af0f9e272a75 (diff) | |
travis: Adapt to radeonsi dropping support for LLVM 4
meson Vulkan, Clover, and autotools Vulkan need to be switched to llvm 5
Fixes: f9eb1ef870eba9fdacf9a8cbd815ec3bff81db05
Signed-off-by: Jan Vesely <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
| -rw-r--r-- | .travis.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index c8b68a66967..e3471d47ac2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,17 +34,17 @@ matrix: - LABEL="meson Vulkan" - BUILD=meson - MESON_OPTIONS="-Ddri-drivers= -Dgallium-drivers=" - - LLVM_VERSION=4.0 + - LLVM_VERSION=5.0 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" addons: apt: sources: - - llvm-toolchain-trusty-4.0 + - llvm-toolchain-trusty-5.0 packages: # LLVM packaging is broken and misses these dependencies - libedit-dev # From sources above - - llvm-4.0-dev + - llvm-5.0-dev # Common - xz-utils - libexpat1-dev @@ -231,7 +231,7 @@ matrix: - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - DRI_DRIVERS="" - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd --enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" - - GALLIUM_DRIVERS="r600,radeonsi" + - GALLIUM_DRIVERS="r600" - VULKAN_DRIVERS="" - LIBUNWIND_FLAGS="--enable-libunwind" addons: @@ -331,7 +331,7 @@ matrix: - BUILD=make - MAKEFLAGS="-j4" - MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel check" - - LLVM_VERSION=4.0 + - LLVM_VERSION=5.0 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl --with-platforms=x11,wayland" - DRI_DRIVERS="" @@ -342,12 +342,12 @@ matrix: addons: apt: sources: - - llvm-toolchain-trusty-4.0 + - llvm-toolchain-trusty-5.0 packages: # LLVM packaging is broken and misses these dependencies - libedit-dev # From sources above - - llvm-4.0-dev + - llvm-5.0-dev # Common - xz-utils - x11proto-xf86vidmode-dev |