summaryrefslogtreecommitdiff
path: root/scons
diff options
context:
space:
mode:
authorVinson Lee <vlee@freedesktop.org>2014-11-15 14:07:42 -0800
committerEmil Velikov <emil.l.velikov@gmail.com>2014-11-19 00:51:50 +0000
commit0a3c1467232995f6f4a288a95d6ce6cf3d2f3fdd (patch)
treedf26081a1ef97fa872e65b2236fea415ee3ad8e9 /scons
parent6452e24ebc6ccc22bca5bf02c4bb0ed27646512a (diff)
scons: Require glproto >= 1.4.13 for X11.
GLXBadProfileARB and X_GLXCreateContextAtrribsARB require glproto >= 1.4.13. These symbols were added in commit d5d41112cbccd9301500e8e023be77eb9cb622cd "st/xlib: Generate errors as specified." Signed-off-by: Vinson Lee <vlee@freedesktop.org> Cc: "10.4" <mesa-stable@lists.freedesktop.org> Reviewed-by: José Fonseca <jfonseca@vmware.com> (cherry picked from commit 876c53375e58a19f8fa1681ae235b463a5781f46)
Diffstat (limited to 'scons')
-rwxr-xr-xscons/gallium.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index e3786d2318c..4df6e1ac275 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -621,7 +621,7 @@ def generate(env):
env.Tool('custom')
createInstallMethods(env)
- env.PkgCheckModules('X11', ['x11', 'xext', 'xdamage', 'xfixes'])
+ env.PkgCheckModules('X11', ['x11', 'xext', 'xdamage', 'xfixes', 'glproto >= 1.4.13'])
env.PkgCheckModules('XCB', ['x11-xcb', 'xcb-glx >= 1.8.1', 'xcb-dri2 >= 1.8'])
env.PkgCheckModules('XF86VIDMODE', ['xxf86vm'])
env.PkgCheckModules('DRM', ['libdrm >= 2.4.38'])