Mesa (10.5): st/egl: don't ship the dri2.c link at the tarball

[Emil Velikov]

Module: Mesa
Branch: 10.5
Commit: 2beab3c01c7be935fc7d2f1f025373cadebdeb4d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2beab3c01c7be935fc7d2f1f025373cadebdeb4d

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Sat Mar 21 22:09:03 2015 +0000

st/egl: don't ship the dri2.c link at the tarball

During 'make dist' the path of the symbolic link (x11/dri2.c) becomes
too long, and tar converts it to hard one. To make it more complicated
on Haiku tar errors out (due to lack of hardlink support) rather than
falling back to the next best thing.
So remove the symlink from git, and disable the scons x11_drm egl code.
The offending code is not build with either automake nor android.

Brian, Jose would you have any objections against this ? I was
playing around to get the symlink resolved, although I could not get the
dependency tracking resolved, so env.Command() was never executed :-\

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89680
Cc: mesa-stable at lists.freedesktop.org
Cc: Alexander von Gluck IV <kallisti5 at unixzen.com>
Cc: Brian Paul <brianp at vmware.com>
Acked-by: Jose Fonseca <jfonseca at vmware.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

---

 src/gallium/state_trackers/egl/Makefile.sources |    1 -
 src/gallium/state_trackers/egl/SConscript       |    3 ++-
 src/gallium/state_trackers/egl/x11/dri2.c       |    1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gallium/state_trackers/egl/Makefile.sources b/src/gallium/state_trackers/egl/Makefile.sources
index 03ded58..0551c16 100644
--- a/src/gallium/state_trackers/egl/Makefile.sources
+++ b/src/gallium/state_trackers/egl/Makefile.sources
@@ -52,6 +52,5 @@ x11_FILES := \
 	x11/native_ximage.c
 
 x11_drm_FILES := \
-	x11/dri2.c \
 	x11/x11_screen.c \
 	x11/x11_screen.h
diff --git a/src/gallium/state_trackers/egl/SConscript b/src/gallium/state_trackers/egl/SConscript
index 3727fb2..a94abc2 100644
--- a/src/gallium/state_trackers/egl/SConscript
+++ b/src/gallium/state_trackers/egl/SConscript
@@ -39,7 +39,8 @@ else:
             '#/src/mapi',
         ])
         sources.append(env.ParseSourceList('Makefile.sources', 'x11_FILES'))
-        if env['drm']:
+        if env['drm'] and False:
+            # XXX: Disabled as we're don't generate the x11/dri2.c symlink at buildtime.
             env.Append(CPPDEFINES = ['GLX_DIRECT_RENDERING'])
             sources.append(env.ParseSourceList('Makefile.sources', 'x11_drm_FILES'))
     if env['drm'] and False:
diff --git a/src/gallium/state_trackers/egl/x11/dri2.c b/src/gallium/state_trackers/egl/x11/dri2.c
deleted file mode 120000
index 344a11c..0000000
--- a/src/gallium/state_trackers/egl/x11/dri2.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../../glx/dri2.c
\ No newline at end of file