[Mesa-dev] [PATCH] scons: Require drm to build gallium/state_trackers/egl/x11/x11_screen.c.

Vinson Lee vlee at freedesktop.org
Mon Dec 3 23:35:16 PST 2012


x11_screen.c includes xf86drm.h, which comes from libdrm-dev.

This patch fixes this build error.

  Compiling src/gallium/state_trackers/egl/x11/x11_screen.c ...
src/gallium/state_trackers/egl/x11/x11_screen.c:30:21: fatal error: xf86drm.h: No such file or directory

Signed-off-by: Vinson Lee <vlee at freedesktop.org>
---
 src/gallium/state_trackers/egl/SConscript |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/state_trackers/egl/SConscript b/src/gallium/state_trackers/egl/SConscript
index 68c7725..2f7ac7e 100644
--- a/src/gallium/state_trackers/egl/SConscript
+++ b/src/gallium/state_trackers/egl/SConscript
@@ -36,11 +36,13 @@ else:
             'x11/native_x11.c',
             'x11/native_dri2.c',
             'x11/native_ximage.c',
-            'x11/x11_screen.c',
             'x11/glxinit.c'])
         if env['drm']:
             env.Append(CPPDEFINES = ['GLX_DIRECT_RENDERING'])
-            sources.append(['#/src/glx/dri2.c'])
+            sources.append([
+                    '#/src/glx/dri2.c',
+                    'x11/x11_screen.c',
+                    ])
     if env['drm'] and False:
         # XXX: Disabled as it depends on gbm, which is not yet built with scons
         env.Append(CPPDEFINES = ['HAVE_DRM_BACKEND'])
-- 
1.7.10.4



More information about the mesa-dev mailing list