diff options
| author | Eric Engestrom <eric@engestrom.ch> | 2020-01-09 15:10:53 +0000 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-08-11 09:35:50 -0700 |
| commit | c09c88fbac4e774496cca6e283de5842614e6a4f (patch) | |
| tree | d9c02f17dcbb20b4734a3b93f67c318caf0710bf /.gitlab-ci | |
| parent | f3c3a1cefff8a4c0a233fe801559ece0fc70a295 (diff) | |
meson: bump required glvnd version
https://github.com/KhronosGroup/EGL-Registry/pull/95 has moved
a couple of extensions defines and functions to the upstream `eglext.h`,
but when 9a74746bd1f3bd28d4c4 sync'ed these files we broke compilation
of apps that require these symbols on systems that don't have the
updated Khronos headers.
On non-GLVND builds, we still provide these headers, so everything's
fine, but on GLVND builds the Khronos headers are external so we need to
make sure we have a libglvnd version that's recent enough.
Fixes: 9a74746bd1f3bd28d4c4 ("EGL: sync headers with Khronos")
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6069>
(cherry picked from commit dd003abd2fc989991b01400ab6614f83d3595ded)
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/container/x86_build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh index 51f0da7dd13..f0b63539f51 100644 --- a/.gitlab-ci/container/x86_build.sh +++ b/.gitlab-ci/container/x86_build.sh @@ -92,7 +92,7 @@ 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 +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 |