From 8bd46c75f9362774e83f53d934b24b170d021f04 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Mon, 17 Feb 2020 15:32:18 +0200 Subject: [PATCH] CI: build a Mesa shapshot for getImage/putImage on pbuffer swrast https://gitlab.freedesktop.org/mesa/mesa/commit/c7617d8908a970124321ce731b43d5996c3c5775 is necessary for running GL-renderer with llvmpipe in Gitlab CI. Signed-off-by: Pekka Paalanen --- .gitlab-ci.yml | 2 +- .gitlab-ci/debian-install.sh | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce8126e2..7ef8820e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ variables: DEBIAN_VERSION: buster DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh' - DEBIAN_TAG: '2019-12-13.0' + DEBIAN_TAG: '2020-02-18.1' DEBIAN_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index accbf1fd..aaa9df72 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -2,6 +2,24 @@ set -o xtrace -o errexit +# These get temporary installed for building Mesa and then force-removed. +MESA_DEV_PKGS=" + bison + flex + gettext + libwayland-egl-backend-dev + libxrandr-dev + llvm-8-dev + python-mako + python3-mako + wayland-protocols +" + +# Needed for running the custom-built mesa +MESA_RUNTIME_PKGS=" + libllvm8 +" + echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list apt-get update apt-get -y --no-install-recommends install \ @@ -57,9 +75,11 @@ apt-get -y --no-install-recommends install \ python3-pip \ python3-setuptools \ xwayland \ + $MESA_RUNTIME_PKGS pip3 install --user git+https://github.com/mesonbuild/meson.git@0.49 +export PATH=$HOME/.local/bin:$PATH # for documentation pip3 install sphinx==2.1.0 --user pip3 install breathe==4.13.0.post0 --user @@ -75,5 +95,16 @@ cd build make install cd ../../ +apt-get -y --no-install-recommends install $MESA_DEV_PKGS +git clone --single-branch --branch master --shallow-since='2020-02-15' https://gitlab.freedesktop.org/mesa/mesa.git mesa +cd mesa +git checkout -b snapshot c7617d8908a970124321ce731b43d5996c3c5775 +meson build -Dauto_features=disabled \ + -Dgallium-drivers=swrast -Dvulkan-drivers= -Ddri-drivers= +ninja -C build install +cd .. +rm -rf mesa +apt-get -y --autoremove purge $MESA_DEV_PKGS + mkdir -p /tmp/.X11-unix chmod 777 /tmp/.X11-unix