diff options
| author | Eric Engestrom <eric@engestrom.ch> | 2020-01-09 15:10:53 +0000 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2020-08-08 17:15:25 +0200 |
| commit | dd003abd2fc989991b01400ab6614f83d3595ded (patch) | |
| tree | 17cb1888caefb527bd725ed3b5cd3db93dac8248 | |
| parent | 7fbadfc385c359fd291d58a75fbe6ce3fdc91747 (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>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/container/x86_build.sh | 2 | ||||
| -rw-r--r-- | meson.build | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4649b9fac5e..69ba9917876 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -222,7 +222,7 @@ x86_build: extends: - .use-x86_build-base variables: - FDO_DISTRIBUTION_TAG: &x86_build "2020-07-28-x86-2" + FDO_DISTRIBUTION_TAG: &x86_build "2020-08-08-glvnd" .use-x86_build: variables: 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 diff --git a/meson.build b/meson.build index 39c49775c44..c76748b7162 100644 --- a/meson.build +++ b/meson.build @@ -1553,7 +1553,7 @@ endif dep_glvnd = null_dep if with_glvnd - dep_glvnd = dependency('libglvnd', version : '>= 1.2.0') + dep_glvnd = dependency('libglvnd', version : '>= 1.3.2') pre_args += '-DUSE_LIBGLVND=1' endif |