diff options
| author | Lukas Rusak <[email protected]> | 2018-06-04 12:38:41 -0700 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2018-06-15 10:43:22 +0100 |
| commit | 4cfc4cef80a85dea2b761efd9f6deb13198c9196 (patch) | |
| tree | a0634c147116e9e8665f42d138d8697182be1346 | |
| parent | 30f1ab7a59223802fea70f363028161ca40470e6 (diff) | |
meson: fix private libs when building without glx
I noticed that the generated pkg-config files will include
glx and x11 dependencies even when x11 isn't a selected platform.
This fixes the private libs and was tested by building kmscube
V2:
- check if gallium-xlib is being used for glx
Fixes: 108d257a16859898f5ce0 "meson: build libEGL"
Reviewed-by: Dylan Baker <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
| -rw-r--r-- | meson.build | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/meson.build b/meson.build index 22e7a6d6cda..8350ce0e842 100644 --- a/meson.build +++ b/meson.build @@ -1371,18 +1371,24 @@ endforeach inc_include = include_directories('include') -gl_priv_reqs = [ - 'x11', 'xext', 'xdamage >= 1.1', 'xfixes', 'x11-xcb', 'xcb', - 'xcb-glx >= 1.8.1'] +gl_priv_reqs = [] + +if with_glx == 'xlib' or with_glx == 'gallium-xlib' + gl_priv_reqs += ['x11', 'xext', 'xcb'] +elif with_glx == 'dri' + gl_priv_reqs += [ + 'x11', 'xext', 'xdamage >= 1.1', 'xfixes', 'x11-xcb', 'xcb', + 'xcb-glx >= 1.8.1'] + if with_dri_platform == 'drm' + gl_priv_reqs += 'xcb-dri2 >= 1.8' + endif +endif if dep_libdrm.found() gl_priv_reqs += 'libdrm >= 2.4.75' endif if dep_xxf86vm.found() gl_priv_reqs += 'xxf86vm' endif -if with_dri_platform == 'drm' - gl_priv_reqs += 'xcb-dri2 >= 1.8' -endif gl_priv_libs = [] if dep_thread.found() |