Module: Mesa Branch: master Commit: 442a7696004c5998d84a3df07d37fa9064dba214 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=442a7696004c5998d84a3df07d37fa9064dba214
Author: Michael Olbrich <[email protected]> Date: Sun Sep 8 13:14:40 2019 +0200 meson.build: xxf86vm is not needed for -Dglx-direct=false It is only used in src/glx/glxcmds.c and when GLX_DIRECT_RENDERING is defined. So only depend on it if GLX direct rendering is actually enabled. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1905> --- meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 3cb3c904927..f1e4118fd5d 100644 --- a/meson.build +++ b/meson.build @@ -1779,7 +1779,9 @@ if with_platform_x11 if with_glx == 'dri' if with_dri_platform == 'drm' dep_dri2proto = dependency('dri2proto', version : '>= 2.8') - dep_xxf86vm = dependency('xxf86vm') + if with_glx_direct + dep_xxf86vm = dependency('xxf86vm') + endif endif endif if (with_egl or @@ -1847,7 +1849,9 @@ elif with_glx == 'dri' 'xcb-glx >= 1.8.1'] if with_dri_platform == 'drm' gl_priv_reqs += 'xcb-dri2 >= 1.8' - gl_priv_reqs += 'xxf86vm' + if with_glx_direct + gl_priv_reqs += 'xxf86vm' + endif endif endif if dep_libdrm.found() _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
