mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-20 13:50:11 +01:00
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 when9a74746bd1sync'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:9a74746bd1("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>
This commit is contained in:
parent
7fbadfc385
commit
dd003abd2f
3 changed files with 3 additions and 3 deletions
|
|
@ -222,7 +222,7 @@ x86_build:
|
||||||
extends:
|
extends:
|
||||||
- .use-x86_build-base
|
- .use-x86_build-base
|
||||||
variables:
|
variables:
|
||||||
FDO_DISTRIBUTION_TAG: &x86_build "2020-07-28-x86-2"
|
FDO_DISTRIBUTION_TAG: &x86_build "2020-08-08-glvnd"
|
||||||
|
|
||||||
.use-x86_build:
|
.use-x86_build:
|
||||||
variables:
|
variables:
|
||||||
|
|
|
||||||
|
|
@ -92,7 +92,7 @@ rm -rf $WAYLAND_PROTOCOLS_VERSION
|
||||||
# The version of libglvnd-dev in debian is too old
|
# 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:
|
# Check this page to see when this local compilation can be dropped in favour of the package:
|
||||||
# https://packages.debian.org/libglvnd-dev
|
# 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
|
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
|
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
|
pushd libglvnd-v$GLVND_VERSION; ./autogen.sh; ./configure; make install; popd
|
||||||
|
|
|
||||||
|
|
@ -1553,7 +1553,7 @@ endif
|
||||||
|
|
||||||
dep_glvnd = null_dep
|
dep_glvnd = null_dep
|
||||||
if with_glvnd
|
if with_glvnd
|
||||||
dep_glvnd = dependency('libglvnd', version : '>= 1.2.0')
|
dep_glvnd = dependency('libglvnd', version : '>= 1.3.2')
|
||||||
pre_args += '-DUSE_LIBGLVND=1'
|
pre_args += '-DUSE_LIBGLVND=1'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue