[Mesa-dev] [PATCH 14/15] travis: enable wayland support

[Emil Velikov]

On 28 April 2017 at 15:54, Andres Gomez <agomez at igalia.com> wrote:
> On Thu, 2017-04-27 at 19:38 +0100, Emil Velikov wrote:
>> From: Emil Velikov <emil.velikov at collabora.com>
>>
>> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
>> ---
>>  .travis.yml | 20 ++++++++++++++++----
>>  1 file changed, 16 insertions(+), 4 deletions(-)
>>
>> diff --git a/.travis.yml b/.travis.yml
>> index 86f88e86b05..32ef3e27651 100644
>> --- a/.travis.yml
>> +++ b/.travis.yml
>> @@ -22,6 +22,7 @@ env:
>>      - LIBTXC_DXTN_VERSION=libtxc_dxtn-1.0.1
>>      - LIBVDPAU_VERSION=libvdpau-1.1
>>      - LIBVA_VERSION=libva-1.6.2
>> +    - LIBWAYLAND_VERSION=wayland-1.11.1
>>      - PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig
>>      - LD_LIBRARY_PATH="$HOME/prefix/lib:$LD_LIBRARY_PATH"
>>
>> @@ -32,8 +33,7 @@ matrix:
>>          - BUILD=make
>>          - MAKEFLAGS=-j2
>>          - MAKE_CHECK_COMMAND="make check"
>> -        # XXX: Add wayland platform
>> -        - DRI_LOADERS="--enable-glx --enable-gbm --enable-egl --with-platforms=x11,drm,surfaceless --enable-osmesa"
>> +        - DRI_LOADERS="--enable-glx --enable-gbm --enable-egl --with-platforms=x11,drm,surfaceless,wayland --enable-osmesa"
>>          - DRI_DRIVERS="i915,i965,radeon,r200,swrast,nouveau"
>>          - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
>>          - GALLIUM_DRIVERS=""
>> @@ -41,6 +41,7 @@ matrix:
>>        addons:
>>          apt:
>>            packages:
>> +            - xz-utils
>>              - x11proto-xf86vidmode-dev
>>              - libexpat1-dev
>>              - libx11-xcb-dev
>> @@ -73,6 +74,7 @@ matrix:
>>              - g++-5
>>              - llvm-3.9-dev
>>              # Common
>> +            - xz-utils
>>              - x11proto-xf86vidmode-dev
>>              - libexpat1-dev
>>              - libx11-xcb-dev
>> @@ -99,6 +101,7 @@ matrix:
>>              # From sources above
>>              - llvm-3.9-dev
>>              # Common
>> +            - xz-utils
>>              - x11proto-xf86vidmode-dev
>>              - libexpat1-dev
>>              - libx11-xcb-dev
>> @@ -135,6 +138,7 @@ matrix:
>>              - clang-3.6
>>              - libclang-3.6-dev
>>              # Common
>> +            - xz-utils
>>              - x11proto-xf86vidmode-dev
>>              - libexpat1-dev
>>              - libx11-xcb-dev
>> @@ -164,6 +168,7 @@ matrix:
>>              # LLVM packaging is broken and misses these dependencies
>>              - libedit-dev
>>              # Common
>> +            - xz-utils
>>              - x11proto-xf86vidmode-dev
>>              - libexpat1-dev
>>              - libx11-xcb-dev
>> @@ -176,9 +181,8 @@ matrix:
>>          - 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: Add wayland platform
>>          # XXX: Platform X11 dependencies are checked when --enable-glx is set
>> -        - DRI_LOADERS="--enable-glx --disable-gbm --enable-egl --with-platforms=x11"
>> +        - DRI_LOADERS="--enable-glx --disable-gbm --enable-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"
>> @@ -194,6 +198,7 @@ matrix:
>>              # From sources above
>>              - llvm-3.9-dev
>>              # Common
>> +            - xz-utils
>>              - x11proto-xf86vidmode-dev
>>              - libexpat1-dev
>>              - libx11-xcb-dev
>> @@ -211,6 +216,7 @@ matrix:
>>            packages:
>>              - scons
>>              # Common
>> +            - xz-utils
>>              - x11proto-xf86vidmode-dev
>>              - libexpat1-dev
>>              - libx11-xcb-dev
>> @@ -235,6 +241,7 @@ matrix:
>>              # From sources above
>>              - llvm-3.3-dev
>>              # Common
>> +            - xz-utils
>>              - x11proto-xf86vidmode-dev
>>              - libexpat1-dev
>>              - libx11-xcb-dev
>> @@ -263,6 +270,7 @@ matrix:
>>              - g++-5
>>              - llvm-3.9-dev
>>              # Common
>> +            - xz-utils
>>              - x11proto-xf86vidmode-dev
>>              - libexpat1-dev
>>              - libx11-xcb-dev
>> @@ -337,6 +345,10 @@ install:
>>    - tar -jxvf $LIBVA_VERSION.tar.bz2
>>    - (cd $LIBVA_VERSION && ./configure --prefix=$HOME/prefix --disable-wayland --disable-dummy-driver && make install)
>>
>> +  - wget http://wayland.freedesktop.org/releases/$LIBWAYLAND_VERSION.tar.xz
>> +  - tar -axvf $LIBWAYLAND_VERSION.tar.xz
>> +  - (cd $LIBWAYLAND_VERSION && ./configure --prefix=$HOME/prefix --enable-libraries --without-host-scanner --disable-documentation --disable-dtd-validation && make install)
>
> I would install xz-utils and and build wayland only if it is needed for
> the build. Hence, making this conditional.
>
In practise xz-utils is already installed, so there should be no
change in terms of execution time.

On the wayland front we're talking about ~10s. Ideally we'll share the
install stage (do it once) - but the Travis people are not there yet.
I've poked them about it though ;-)

-Emil