Module: Mesa
Branch: master
Commit: 4cfc4cef80a85dea2b761efd9f6deb13198c9196
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4cfc4cef80a85dea2b761efd9f6deb13198c9196
Author: Lukas Rusak <loru...@gmail.com>
Date: Mon Jun 4 12:38:41 2018 -0700
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 <dy...@pnwbakers.com>
Reviewed-by: Eric Engestrom <eric.engest...@intel.com>
---
meson.build | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
index 22e7a6d6cd..8350ce0e84 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()
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
