Mesa (master): scons: Also require recent XCB.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Thu Jul 12 20:15:03 UTC 2012
Module: Mesa
Branch: master
Commit: bd3aab8d7915b0bc5829a32964955d9da84bef3b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bd3aab8d7915b0bc5829a32964955d9da84bef3b
Author: José Fonseca <jfonseca at vmware.com>
Date: Thu Jul 12 21:13:10 2012 +0100
scons: Also require recent XCB.
And don't trip when it's not found -- simply skip building src/glx.
---
scons/gallium.py | 2 +-
src/glx/SConscript | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/scons/gallium.py b/scons/gallium.py
index 75c713d..c223255 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -516,7 +516,7 @@ def generate(env):
createInstallMethods(env)
env.PkgCheckModules('X11', ['x11', 'xext', 'xdamage', 'xfixes'])
- env.PkgCheckModules('XCB', ['x11-xcb', 'xcb-glx'])
+ env.PkgCheckModules('XCB', ['x11-xcb', 'xcb-glx >= 1.8.1'])
env.PkgCheckModules('XF86VIDMODE', ['xxf86vm'])
env.PkgCheckModules('DRM', ['libdrm >= 2.4.24'])
env.PkgCheckModules('DRM_INTEL', ['libdrm_intel >= 2.4.30'])
diff --git a/src/glx/SConscript b/src/glx/SConscript
index 664cb86..c921eef 100644
--- a/src/glx/SConscript
+++ b/src/glx/SConscript
@@ -1,5 +1,8 @@
Import('*')
+if not env['x11'] or not env['xcb'] or not env['drm']:
+ Return()
+
from sys import executable as python_cmd
env = env.Clone()
More information about the mesa-commit
mailing list