diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2021-03-22 16:45:54 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-04-14 13:05:08 +0000 |
| commit | b0ab534c2d8754df2ff5a8a05be96c9ea5b7412f (patch) | |
| tree | 5f4a0e511c435a5de619e0e07f3ddafee2b4be03 /.gitlab-ci | |
| parent | 0155881d8288878f384d7b7645a3758ee733cac3 (diff) | |
ci: Install GLVND from Debian bullseye
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9833>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/container/x86_build.sh | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh index 4d4b7622b67..6fdc053aad8 100644 --- a/.gitlab-ci/container/x86_build.sh +++ b/.gitlab-ci/container/x86_build.sh @@ -27,6 +27,7 @@ apt-get install -y --no-remove \ libasan6 \ libarchive-dev \ libclang-cpp11-dev \ + libglvnd-dev \ libllvmspirvlib-dev \ liblua5.3-dev \ libxcb-dri2-0-dev \ @@ -84,16 +85,6 @@ cd $LIBWAYLAND_VERSION; ./configure --enable-libraries --without-host-scanner -- rm -rf $LIBWAYLAND_VERSION -# The version of libglvnd-dev in debian is too old -# Check this page to see when this local compilation can be dropped in favour of the package: -# https://packages.debian.org/libglvnd-dev -GLVND_VERSION=1.3.2 -wget https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v$GLVND_VERSION/libglvnd-v$GLVND_VERSION.tar.gz -tar -xvf libglvnd-v$GLVND_VERSION.tar.gz && rm libglvnd-v$GLVND_VERSION.tar.gz -pushd libglvnd-v$GLVND_VERSION; ./autogen.sh; ./configure; make install; popd -rm -rf libglvnd-v$GLVND_VERSION - - pushd /usr/local git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1 rm -rf shader-db/.git |