diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-09-25 23:25:27 +0000 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-09-26 08:47:50 -0700 |
| commit | 41b57b8b73ec08a553c691542b00d77180bff422 (patch) | |
| tree | 4ae3999a42bcfd9d4f4192896a14b9a30572cff4 /meson.build | |
| parent | 109137ee7bc2d6e197d03f03dfebdf9a7748a137 (diff) | |
meson: fix logic for generating .pc files with old glvnd
We want to generate PC files for non-glvnd builds and for builds with
old glvnd, but the current logic doesn't do that, it builds them
unconditionally, and for GLES it builds the shared libraries, which is
also not what we want. This does not generate .pc files for gles1 or
gles2. Which it we weren't doing before either, making this not a
regression but a return to status-quo.o
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/1838
Fixes: 93df862b6affb6b8507e40601212a58012bfa873
("meson: re-add incorrect pkg-config files with GLVND for backward compatibility")
Reviewed-by: Matt Turner <mattst88@gmail.com>
(cherry picked from commit fafd20f67dec9f5891838435ecde1dedb77ab742)
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 0529d8acb54..1782b91edc2 100644 --- a/meson.build +++ b/meson.build @@ -93,7 +93,7 @@ with_shared_glapi = get_option('shared-glapi') # shared-glapi is required if at least two OpenGL APIs are being built if not with_shared_glapi - if ((with_gles1 == 'true' and with_gles2 == 'true') or + if ((with_gles1 == 'true' and with_gles2 == 'true') or (with_gles1 == 'true' and with_opengl) or (with_gles2 == 'true' and with_opengl)) error('shared-glapi required for building two or more of OpenGL, OpenGL ES 1.x, OpenGL ES 2.x') @@ -385,7 +385,7 @@ endif if with_glx != 'disabled' if not (with_platform_x11 and with_any_opengl) error('Cannot build GLX support without X11 platform support and at least one OpenGL API') - elif with_glx == 'gallium-xlib' + elif with_glx == 'gallium-xlib' if not with_gallium error('Gallium-xlib based GLX requires at least one gallium driver') elif not with_gallium_softpipe @@ -393,7 +393,7 @@ if with_glx != 'disabled' elif with_dri error('gallium-xlib conflicts with any dri driver') endif - elif with_glx == 'xlib' + elif with_glx == 'xlib' if with_dri error('xlib conflicts with any dri driver') endif @@ -1298,6 +1298,7 @@ else endif dep_glvnd = null_dep +glvnd_missing_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, @@ -1434,7 +1435,7 @@ if with_platform_x11 if with_glx == 'dri' or with_glx == 'gallium-xlib' dep_glproto = dependency('glproto', version : '>= 1.4.14') endif - if with_glx == 'dri' + if with_glx == 'dri' if with_dri_platform == 'drm' dep_dri2proto = dependency('dri2proto', version : '>= 2.8') dep_xxf86vm = dependency('xxf86vm') |