nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: mesa: Update to 18.0.2. 

* gnu/packages/gl.scm (mesa): Update to 18.0.2.
[arguments]: Remove unused "s2tc" input from 'fix-dlopen-libnames phase.
This commit is contained in:
Rutger Helling 2018-05-01 15:42:29 +02:00
parent 0ed990530f
commit db48197761
No known key found for this signature in database
GPG Key ID: F3A727DB44FCCA36
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/gl.scm
View File

@ -222,7 +222,7 @@ also known as DXTn or DXTC) for Mesa.")
(define-public mesa (define-public mesa
(package (package
(name "mesa") (name "mesa")
(version "17.3.8") (version "18.0.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -234,7 +234,7 @@ also known as DXTn or DXTC) for Mesa.")
version "/mesa-" version ".tar.xz"))) version "/mesa-" version ".tar.xz")))
(sha256 (sha256
(base32 (base32
"1cd6a4ll5arla3kncxnw9196ak1v4rvnb098aa7lm3n4h7r9p7cg")) "1cz7p4b4yy201djzv3s28zx27f5cqwv0zgzqp5lcaba8d2bibylq"))
(patches (patches
(search-patches "mesa-wayland-egl-symbols-check-mips.patch" (search-patches "mesa-wayland-egl-symbols-check-mips.patch"
"mesa-skip-disk-cache-test.patch")))) "mesa-skip-disk-cache-test.patch"))))
@ -337,15 +337,9 @@ also known as DXTn or DXTC) for Mesa.")
(add-before (add-before
'build 'fix-dlopen-libnames 'build 'fix-dlopen-libnames
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((s2tc (assoc-ref inputs "s2tc")) (let ((out (assoc-ref outputs "out")))
(out (assoc-ref outputs "out")))
;; Remain agnostic to .so.X.Y.Z versions while doing ;; Remain agnostic to .so.X.Y.Z versions while doing
;; the substitutions so we're future-safe. ;; 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")))
(substitute* "src/glx/dri_common.c" (substitute* "src/glx/dri_common.c"
(("dlopen\\(\"libGL\\.so") (("dlopen\\(\"libGL\\.so")
(string-append "dlopen(\"" out "/lib/libGL.so"))) (string-append "dlopen(\"" out "/lib/libGL.so")))