diff options
| author | Eric Engestrom <eric.engestrom@intel.com> | 2019-09-30 10:26:43 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-10-11 11:09:26 -0700 |
| commit | f446e56d30ceb47ca9b434f2a8284210556b7c70 (patch) | |
| tree | c08955767f0ff0043110bfb17ffc20fc727bcdad | |
| parent | 767965b6fa96acb8ecc948ddd1d0c232aa2e9914 (diff) | |
meson: rename `glvnd_missing_pc_files` to `not glvnd_has_headers_and_pc_files`
This reflects better what is provided by glvnd or not.
Fixes: 93df862b6affb6b8507e ("meson: re-add incorrect pkg-config files with GLVND for backward compatibility")
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
(cherry picked from commit b57fa7ca49f7ddb67ac47f392de05af388e73565)
| -rw-r--r-- | meson.build | 9 | ||||
| -rw-r--r-- | src/egl/meson.build | 4 | ||||
| -rw-r--r-- | src/meson.build | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/meson.build b/meson.build index db94f85f04e..0361e0ca1ec 100644 --- a/meson.build +++ b/meson.build @@ -1300,13 +1300,12 @@ else endif dep_glvnd = null_dep -glvnd_missing_pc_files = false +glvnd_has_headers_and_pc_files = false if with_glvnd dep_glvnd = dependency('libglvnd', version : '>= 0.2.0') - # GLVND until commit 0dfaea2bcb7cdcc785f9 ("Add pkg-config files for EGL, GL, - # GLES, and GLX.") was missing its pkg-config files, forcing every vendor to - # provide them and the distro maintainers to resolve the conflict. - glvnd_missing_pc_files = dep_glvnd.version().version_compare('< 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 diff --git a/src/egl/meson.build b/src/egl/meson.build index 7d738e2ebd1..9c2c055c3eb 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -176,8 +176,8 @@ libegl = shared_library( # If using glvnd the pkg-config header should not point to EGL_mesa, it should # point to EGL. glvnd is only available on unix like platforms so adding -l # should be safe here -if not with_glvnd or glvnd_missing_pc_files - if glvnd_missing_pc_files +if not with_glvnd or not glvnd_has_headers_and_pc_files + if not glvnd_has_headers_and_pc_files _egl = '-L${libdir} -lEGL' else _egl = libegl diff --git a/src/meson.build b/src/meson.build index 29cf25831f2..58697d733fd 100644 --- a/src/meson.build +++ b/src/meson.build @@ -106,12 +106,12 @@ endif # This must be after at least mesa, glx, and gallium, since libgl will be # defined in one of those subdirs depending on the glx provider. -if with_glx != 'disabled' and (not with_glvnd or glvnd_missing_pc_files) +if with_glx != 'disabled' and (not with_glvnd or not glvnd_has_headers_and_pc_files) # If using glvnd the pkg-config header should not point to GL_mesa, it should # point to GL. glvnd is only available on unix like platforms so adding -l # should be safe here # TODO: in the glvnd case glvnd itself should really be providing this. - if glvnd_missing_pc_files + if not glvnd_has_headers_and_pc_files _gl = '-L${libdir} -lGL' else _gl = libgl |