From: Vinson Lee <vlee@freedesktop.org>
Date: Sat, 15 Nov 2014 22:07:42 +0000 (-0800)
Subject: scons: Require glproto >= 1.4.13 for X11.
X-Git-Tag: upstream/17.1.0~22453
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=876c53375e58a19f8fa1681ae235b463a5781f46;p=platform%2Fupstream%2Fmesa.git

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>
---

diff --git a/scons/gallium.py b/scons/gallium.py
index e3786d2..4df6e1a 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'])