OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scons: Also require recent XCB.

Browse Source 
And don't trip when it's not found -- simply skip building src/glx.
This commit is contained in:
José Fonseca
2012-07-12 21:13:10 +01:00
parent 6882381a2e
commit bd3aab8d79
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scons/gallium.py
View File

@@ -516,7 +516,7 @@ def generate(env):
createInstallMethods(env) createInstallMethods(env)
env.PkgCheckModules('X11', ['x11', 'xext', 'xdamage', 'xfixes']) 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('XF86VIDMODE', ['xxf86vm'])
env.PkgCheckModules('DRM', ['libdrm >= 2.4.24']) env.PkgCheckModules('DRM', ['libdrm >= 2.4.24'])
env.PkgCheckModules('DRM_INTEL', ['libdrm_intel >= 2.4.30']) env.PkgCheckModules('DRM_INTEL', ['libdrm_intel >= 2.4.30'])

3
src/glx/SConscript
View File

@@ -1,5 +1,8 @@
Import('*') Import('*')
if not env['x11'] or not env['xcb'] or not env['drm']:
Return()
from sys import executable as python_cmd from sys import executable as python_cmd
env = env.Clone() env = env.Clone()