gitlab-ci: build a recent enough version of GLVND (ie. 1.2.0)

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
This commit is contained in:
Eric Engestrom 2019-09-25 20:18:27 +01:00
parent c32236811d
commit 9b58ab803d
2 changed files with 24 additions and 2 deletions

View File

@ -14,7 +14,7 @@
# repository's registry will be used there as well.
variables:
UPSTREAM_REPO: mesa/mesa
DEBIAN_TAG: "2019-10-29"
DEBIAN_TAG: "2019-10-30"
DEBIAN_ARM64_TAG: "arm64v8-2019-10-23"
STRETCH_TAG: "2019-09-18"
DEBIAN_VERSION: buster-slim

View File

@ -58,7 +58,13 @@ apt-get install -y --no-remove \
libx11-xcb-dev \
libelf-dev \
libunwind-dev \
libglvnd-dev \
autoconf \
automake \
autotools-dev \
libtool \
libxext-dev \
libx11-dev \
x11proto-gl-dev \
libgtk-3-dev \
libpng-dev \
libgbm-dev \
@ -197,6 +203,17 @@ tar -xvf $WAYLAND_PROTOCOLS_VERSION.tar.xz && rm $WAYLAND_PROTOCOLS_VERSION.tar.
cd $WAYLAND_PROTOCOLS_VERSION; ./configure; make install; cd ..
rm -rf $WAYLAND_PROTOCOLS_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.2.0
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
@ -279,6 +296,11 @@ apt-get purge -y \
unzip \
cmake \
git \
autoconf \
automake \
autotools-dev \
libtool \
x11proto-gl-dev \
libgles2-mesa-dev \
libgbm-dev