02/02: gnu: mesa: Enable more optional features.

[Taylan Ulrich B.]

taylanub pushed a commit to branch master
in repository guix.

commit 3e2570d8379fa8f5fe359960c9c3474fe2e83d0a
Author: Taylan Ulrich Bayırlı/Kammer <address@hidden>
Date:   Tue Mar 17 17:15:52 2015 +0100

    gnu: mesa: Enable more optional features.
    
    * gnu/packages/gl.scm (mesa): Enable DRM support of EGL, thread local 
storage
      in GLX, and off-screen rendering.
---
 gnu/packages/gl.scm |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 585905c..e9b2c53 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -199,6 +199,13 @@ also known as DXTn or DXTC) for Mesa.")
      `(#:configure-flags
        '(;; drop r300 from default gallium drivers, as it requires llvm
          "--with-gallium-drivers=r600,svga,swrast"
+         ;; Enable various optional features.  TODO: opencl requires libclc,
+         ;; omx requires libomxil-bellagio
+         "--with-egl-platforms=x11,drm"
+         "--enable-glx-tls"        ;Thread Local Storage, improves performance
+         ;; "--enable-opencl"
+         ;; "--enable-omx"
+         "--enable-osmesa"
          "--enable-xa"
 
          ;; on non-intel systems, drop i915 and i965
@@ -246,7 +253,13 @@ also known as DXTn or DXTC) for Mesa.")
                           (string-append "dlopen(\"" out "/lib/libGL.so")))
                        (substitute* "src/egl/drivers/dri2/egl_dri2.c"
                          (("\"libglapi\\.so")
-                          (string-append "\"" out "/lib/libglapi.so")))))
+                          (string-append "\"" out "/lib/libglapi.so")))
+                       (substitute* "src/gbm/main/backend.c"
+                         ;; No need to patch the gbm_gallium_drm.so reference;
+                         ;; it's never installed since Mesa removed its
+                         ;; egl_gallium support.
+                         (("\"gbm_dri\\.so")
+                          (string-append "\"" out "/lib/dri/gbm_dri.so")))))
                    %standard-phases)))))
     (home-page "http://mesa3d.org/";)
     (synopsis "OpenGL implementation")