From bd3aab8d7915b0bc5829a32964955d9da84bef3b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Thu, 12 Jul 2012 21:13:10 +0100 Subject: [PATCH] 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 deletion(-) diff --git a/scons/gallium.py b/scons/gallium.py index 75c713d1ce3..c223255abc2 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 664cb86268d..c921eef7037 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() -- 2.30.2