From 6e21dcc5a31634232660eff1a83052c2ebb4816c Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 25 Sep 2019 17:38:49 +0100 Subject: meson: revert glvnd workaround This effectively reverts MR !2112. Signed-off-by: Eric Engestrom Reviewed-by: Dylan Baker --- meson.build | 4 ---- 1 file changed, 4 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 9871d9d6aa9..b2d160ccedf 100644 --- a/meson.build +++ b/meson.build @@ -1447,12 +1447,8 @@ else endif dep_glvnd = null_dep -glvnd_has_headers_and_pc_files = false if with_glvnd dep_glvnd = dependency('libglvnd', version : '>= 1.2.0') - # GLVND before 1.2 was missing its pkg-config and header files, forcing every - # vendor to provide them and the distro maintainers to resolve the conflict. - glvnd_has_headers_and_pc_files = dep_glvnd.version().version_compare('>= 1.2.0') pre_args += '-DUSE_LIBGLVND=1' endif -- cgit v1.2.3