diff options
| author | Andres Gomez <agomez@igalia.com> | 2017-07-19 19:14:03 +0300 |
|---|---|---|
| committer | Andres Gomez <agomez@igalia.com> | 2017-07-19 22:17:41 +0300 |
| commit | 9375c1d896d1cce824490357b606d31b64d0143e (patch) | |
| tree | 3051c37f57fe99c15f115a54f86808d756363853 /.travis.yml | |
| parent | 5d6905211355464de4885492511e5f9d936cc058 (diff) | |
travis: add missing wayland-protocols
> checking for WAYLAND... no
>
> configure: error: Package requirements (wayland-client >= 1.11 wayland-server >= 1.11 wayland-protocols >= 1.8) were not met:
>
> No package 'wayland-protocols' found
>
> Consider adjusting the PKG_CONFIG_PATH environment variable if you
> installed software in a non-standard prefix.
>
> Alternatively, you may set the environment variables WAYLAND_CFLAGS
> and WAYLAND_LIBS to avoid the need to call pkg-config.
> See the pkg-config man page for more details.
Also, added extra path to PKG_CONFIG_PATH env variable.
Fixes: 02cc359372 ("egl/wayland: Use linux-dmabuf interface for buffers")
Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index fa52bf96f1..246ad30eff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ env: global: - XORG_RELEASES=http://xorg.freedesktop.org/releases/individual - XCB_RELEASES=http://xcb.freedesktop.org/dist + - WAYLAND_RELEASES=http://wayland.freedesktop.org/releases - XORGMACROS_VERSION=util-macros-1.19.0 - GLPROTO_VERSION=glproto-1.4.17 - DRI2PROTO_VERSION=dri2proto-2.8 @@ -23,7 +24,8 @@ env: - LIBVDPAU_VERSION=libvdpau-1.1 - LIBVA_VERSION=libva-1.6.2 - LIBWAYLAND_VERSION=wayland-1.11.1 - - PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig + - WAYLAND_PROTOCOLS_VERSION=wayland-protocols-1.8 + - PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig:$HOME/prefix/share/pkgconfig - LD_LIBRARY_PATH="$HOME/prefix/lib:$LD_LIBRARY_PATH" matrix: @@ -336,10 +338,14 @@ 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 + - wget $WAYLAND_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) + - wget $WAYLAND_RELEASES/$WAYLAND_PROTOCOLS_VERSION.tar.xz + - tar -axvf $WAYLAND_PROTOCOLS_VERSION.tar.xz + - (cd $WAYLAND_PROTOCOLS_VERSION && ./configure --prefix=$HOME/prefix && make install) + # Generate the header since one is missing on the Travis instance - mkdir -p linux - printf "%s\n" \ |