[virglrenderer-devel] [virglrenderer-devel v1 09/13] ci: Don't build x11/wayland mesa platforms

[Robert Foss]

Hey,

On 2018-11-21 16:12, Robert Foss wrote:
> Signed-off-by: Robert Foss <robert.foss at collabora.com>
> ---
>   ci/Dockerfile | 12 ++----------
>   1 file changed, 2 insertions(+), 10 deletions(-)
> 
> diff --git a/ci/Dockerfile b/ci/Dockerfile
> index b9c01d2..1b1c5cb 100644
> --- a/ci/Dockerfile
> +++ b/ci/Dockerfile
> @@ -21,12 +21,10 @@ RUN apt-get update
>   RUN apt-get -y install ca-certificates && \
>       apt-get -y install --no-install-recommends \
>         libgbm-dev \
> -      libxvmc-dev \
>         autoconf \
>         golang-go \
>         cmake \
>         spirv-headers \
> -      xinit \
>         check \
>         linux-image-amd64 \
>         git \
> @@ -40,8 +38,6 @@ RUN apt-get -y install ca-certificates && \
>         busybox \
>         kbd \
>         ccache \
> -      xserver-xorg-core \
> -      xterm \
>         wget \
>         gdc-6 \
>         clang-6.0 \
> @@ -50,20 +46,16 @@ RUN apt-get -y install ca-certificates && \
>         waffle-utils \
>         gdb \
>         libcurl4-openssl-dev \
> -      xvfb \
>         mesa-utils \
>         strace \
>         psmisc \
>         libpng-dev \
> -      libxrandr-dev \
>         libsm-dev \
>         ninja-build \
>         zlib1g-dev \
>         python3-pip \
>         python3-setuptools \
> -      python3-wheel \
> -      libwayland-dev \
> -      libwayland-egl-backend-dev

This chunk is causing the mesa build to fail, even after the wayland platform 
has been disabled. I'll fix this in v2.

> +      python3-wheel
>   
>   RUN apt-get -y build-dep --no-install-recommends \
>         qemu \
> @@ -161,7 +153,7 @@ RUN git clone --shallow-since="$GIT_DATE" https://gitlab.freedesktop.org/mesa/me
>       git log --oneline -n 1 && \
>       mkdir -p build && \
>       meson build/ && \
> -    meson configure build/ -Dprefix=/usr/local -Dplatforms=drm,x11,wayland,surfaceless -Ddri-drivers=i965 -Dgallium-drivers=swrast,virgl,radeonsi,r600 -Dbuildtype=debugoptimized -Dllvm=true -Dglx=dri -Dgallium-vdpau=false -Dgallium-va=false -Dvulkan-drivers=[] -Dlibdir=lib && \
> +    meson configure build/ -Dprefix=/usr/local -Dplatforms=drm,surfaceless -Ddri-drivers=i965 -Dgallium-drivers=swrast,virgl,radeonsi,r600 -Dbuildtype=debugoptimized -Dllvm=true -Dglx=dri -Dgallium-vdpau=false -Dgallium-va=false -Dvulkan-drivers=[] -Dlibdir=lib && \
>       ninja -C build/ install && \
>       rm -rf /mesa
>   WORKDIR /
>