guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/04: gnu: mesa: Add input s2tc.


From: Taylan Ulrich B.
Subject: 02/04: gnu: mesa: Add input s2tc.
Date: Thu, 19 Mar 2015 09:04:36 +0000

taylanub pushed a commit to branch master
in repository guix.

commit 3e71b9ffd67e0b5c08c6e9fbe9c79a26308098cc
Author: Taylan Ulrich Bayırlı/Kammer <address@hidden>
Date:   Sat Mar 14 15:05:15 2015 +0100

    gnu: mesa: Add input s2tc.
    
    * gnu/packages/gl.scm (mesa): Add input s2tc, patch sources to make the
      reference to libtxc_dxtn.so absolute since it's passed to dlopen(3).
---
 gnu/packages/gl.scm |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index e5d3a8d..1eb2055 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -186,7 +186,8 @@ also known as DXTn or DXTC) for Mesa.")
         ("libxml2" ,libxml2)
         ;; TODO: Add 'libva'
         ;; TODO: Add 'libxml2-python' for OpenGL ES 1.1 and 2.0 support
-        ("makedepend" ,makedepend)))
+        ("makedepend" ,makedepend)
+        ("s2tc" ,s2tc)))
     (native-inputs
       `(("pkg-config" ,pkg-config)
         ("gettext" ,gnu-gettext)
@@ -220,7 +221,18 @@ also known as DXTn or DXTC) for Mesa.")
                   (lambda _
                     (substitute* 
"src/glsl/tests/lower_jumps/create_test_cases.py"
                       (("/usr/bin/env bash") (which "bash"))))
-                  %standard-phases))))
+                  (alist-cons-before
+                   'build 'fix-dxtn-libname
+                   (lambda* (#:key inputs #:allow-other-keys)
+                     (let ((s2tc (assoc-ref inputs "s2tc")))
+                       ;; Remain agnostic to .so.X.Y.Z versions while doing
+                       ;; the substitutions so we're future-safe.
+                       (substitute*
+                           '("src/gallium/auxiliary/util/u_format_s3tc.c"
+                             "src/mesa/main/texcompress_s3tc.c")
+                         (("\"libtxc_dxtn\\.so")
+                          (string-append "\"" s2tc "/lib/libtxc_dxtn.so")))))
+                   %standard-phases)))))
     (home-page "http://mesa3d.org/";)
     (synopsis "OpenGL implementation")
     (description "Mesa is a free implementation of the OpenGL specification -



reply via email to

[Prev in Thread] Current Thread [Next in Thread]