- DRI2PROTO_VERSION=dri2proto-2.8
- LIBPCIACCESS_VERSION=libpciaccess-0.13.4
- LIBDRM_VERSION=libdrm-2.4.74
- - XCBPROTO_VERSION=xcb-proto-1.11
- - LIBXCB_VERSION=libxcb-1.11
+ - XCBPROTO_VERSION=xcb-proto-1.13
+ - LIBXCB_VERSION=libxcb-1.13
- LIBXSHMFENCE_VERSION=libxshmfence-1.2
- LIBVDPAU_VERSION=libvdpau-1.1
- LIBVA_VERSION=libva-1.6.2
- LABEL="meson Vulkan"
- BUILD=meson
- MESON_OPTIONS="-Ddri-drivers= -Dgallium-drivers="
+ - LLVM_VERSION=4.0
+ - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
addons:
apt:
sources:
- BUILD=make
- MAKEFLAGS="-j4"
- MAKE_CHECK_COMMAND="true"
- - LLVM_VERSION=3.9
+ - LLVM_VERSION=4.0
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
- OVERRIDE_CC="gcc-4.8"
- OVERRIDE_CXX="g++-4.8"
- # New binutils linker is required for llvm-3.9
- - OVERRIDE_PATH=/usr/lib/binutils-2.26/bin
- 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"
addons:
apt:
sources:
- - llvm-toolchain-trusty-3.9
+ - llvm-toolchain-trusty-4.0
packages:
- - binutils-2.26
# LLVM packaging is broken and misses these dependencies
- libedit-dev
# From sources above
- - llvm-3.9-dev
+ - llvm-4.0-dev
# Common
- xz-utils
- x11proto-xf86vidmode-dev
- BUILD=scons
- SCONSFLAGS="-j4"
- SCONS_TARGET="swr=1"
- - LLVM_VERSION=3.9
+ - LLVM_VERSION=4.0
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
# Keep it symmetrical to the make build. There's no actual SWR, yet.
- SCONS_CHECK_COMMAND="true"
addons:
apt:
sources:
- - llvm-toolchain-trusty-3.9
+ - llvm-toolchain-trusty-4.0
packages:
- scons
# LLVM packaging is broken and misses these dependencies
- libedit-dev
# From sources above
- - llvm-3.9-dev
+ - llvm-4.0-dev
# Common
- xz-utils
- x11proto-xf86vidmode-dev
install:
- pip2 install --user mako
- # Install the latest meson from pip, since the version in the ubuntu repos is
- # often quite old.
+ # 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;
+ pip3 install --user "meson<0.45.0";
fi
# Since libdrm gets updated in configure.ac regularly, try to pick up the
scons $SCONS_TARGET && eval $SCONS_CHECK_COMMAND;
fi
- - if test "x$BUILD" = xmeson; then
- export CFLAGS="$CFLAGS -isystem`pwd`";
- meson _build $MESON_OPTIONS;
- ninja -C _build;
+ - |
+ if test "x$BUILD" = xmeson; then
+
+ # 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.
+ #
+ # As for 0.44.x, Meson cannot receive the path to the
+ # llvm-config binary as a configuration parameter. See
+ # https://github.com/mesonbuild/meson/issues/2887 and
+ # https://github.com/dcbaker/meson/commit/7c8b6ee3fa42f43c9ac7dcacc61a77eca3f1bcef
+ #
+ # We want to use the custom (APT) installed version. Therefore,
+ # let's make Meson find our wanted version sooner than the one
+ # at /usr/local/bin
+ #
+ # Once this is corrected, we would still need a patch similar
+ # to:
+ # https://lists.freedesktop.org/archives/mesa-dev/2017-December/180217.html
+ test -f /usr/bin/$LLVM_CONFIG && ln -s /usr/bin/$LLVM_CONFIG $HOME/prefix/bin/llvm-config
+
+ export CFLAGS="$CFLAGS -isystem`pwd`"
+ meson _build $MESON_OPTIONS
+ ninja -C _build
fi