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