01/01: gnu: mesa: Build LLVM Gallium drivers.

[Ricardo Wurmus]

rekado pushed a commit to branch core-updates
in repository guix.

commit 093c6f8bc734246491530e58b363fbdd6782f439
Author: Ricardo Wurmus <address@hidden>
Date:   Tue Oct 18 09:50:37 2016 +0200

    gnu: mesa: Build LLVM Gallium drivers.
    
    Fixes <https://bugs.gnu.org/25953>.
    
    * gnu/packages/gl.scm (mesa)[inputs]: Add llvm.
    [arguments]: Build LLVM Gallium drivers.
---
 gnu/packages/gl.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 53f720a..fce44b4 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2014, 2016 David Thompson <address@hidden>
 ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <address@hidden>
 ;;; Copyright © 2016 ng0 <address@hidden>
-;;; Copyright © 2016 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2016, 2017 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2016 David Thompson <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -33,6 +33,7 @@
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages llvm)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages video)
@@ -230,14 +231,15 @@ also known as DXTn or DXTC) for Mesa.")
         ("makedepend" ,makedepend)
         ("presentproto" ,presentproto)
         ("s2tc" ,s2tc)
+        ("llvm" ,llvm)
         ("wayland" ,wayland)))
     (native-inputs
       `(("pkg-config" ,pkg-config)
         ("python" ,python-2)))
     (arguments
      `(#:configure-flags
-       '(;; drop r300 from default gallium drivers, as it requires llvm
-         "--with-gallium-drivers=r600,svga,swrast,nouveau,virgl"
+       '("--with-gallium-drivers=i915,r300,r600,svga,swrast,nouveau,virgl"
+         "--enable-gallium-llvm"
          ;; Enable various optional features.  TODO: opencl requires libclc,
          ;; omx requires libomxil-bellagio
          "--with-egl-platforms=x11,drm,wayland"