gnu: mesa: Update to 13.0.2.
* gnu/packages/gl.scm (mesa): Update to 13.0.2. [inputs]: Remove eudev. [native-inputs]: Move 'mesa-wayland-egl-symbols-check-mips.patch' to ... [source]: ... here. [arguments]: Don't apply patch. Remove udev substitution.
This commit is contained in:
parent
bc118f1a03
commit
17f2b485b1
|
@ -196,7 +196,7 @@ also known as DXTn or DXTC) for Mesa.")
|
||||||
(define-public mesa
|
(define-public mesa
|
||||||
(package
|
(package
|
||||||
(name "mesa")
|
(name "mesa")
|
||||||
(version "12.0.1")
|
(version "13.0.2")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -204,7 +204,9 @@ also known as DXTn or DXTC) for Mesa.")
|
||||||
version "/mesa-" version ".tar.xz"))
|
version "/mesa-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"12b3i59xdn2in2hchrkgh4fwij8zhznibx976l3pdj3qkyvlzcms"))))
|
"1m8n8kd8kcs5ddyvldiw09wvpi5wwpfmmxlb87d63vgl8lk65vd6"))
|
||||||
|
(patches
|
||||||
|
(search-patches "mesa-wayland-egl-symbols-check-mips.patch"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("glproto" ,glproto)
|
`(("glproto" ,glproto)
|
||||||
|
@ -227,20 +229,10 @@ also known as DXTn or DXTC) for Mesa.")
|
||||||
("makedepend" ,makedepend)
|
("makedepend" ,makedepend)
|
||||||
("presentproto" ,presentproto)
|
("presentproto" ,presentproto)
|
||||||
("s2tc" ,s2tc)
|
("s2tc" ,s2tc)
|
||||||
("udev" ,eudev)
|
|
||||||
("wayland" ,wayland)))
|
("wayland" ,wayland)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)
|
`(("pkg-config" ,pkg-config)
|
||||||
("python" ,python-2)
|
("python" ,python-2)))
|
||||||
|
|
||||||
;; XXX To prevent a large number of rebuilds on other systems,
|
|
||||||
;; apply the following patch on MIPS systems only. In the next
|
|
||||||
;; core-updates cycle, this patch could be applied on all platforms.
|
|
||||||
,@(if (string-prefix? "mips" (or (%current-target-system)
|
|
||||||
(%current-system)))
|
|
||||||
`(("mips-patch"
|
|
||||||
,(search-patch "mesa-wayland-egl-symbols-check-mips.patch")))
|
|
||||||
'())))
|
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags
|
`(#:configure-flags
|
||||||
'(;; drop r300 from default gallium drivers, as it requires llvm
|
'(;; drop r300 from default gallium drivers, as it requires llvm
|
||||||
|
@ -267,16 +259,6 @@ also known as DXTn or DXTC) for Mesa.")
|
||||||
'("--with-dri-drivers=nouveau,r200,radeon,swrast"))))
|
'("--with-dri-drivers=nouveau,r200,radeon,swrast"))))
|
||||||
#:phases
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
;; Add an 'apply-mips-patch' phase conditionally (see above.)
|
|
||||||
,@(if (string-prefix? "mips" (or (%current-target-system)
|
|
||||||
(%current-system)))
|
|
||||||
`((add-after 'unpack 'apply-mips-patch
|
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
|
||||||
(let ((patch (assoc-ref inputs "mips-patch")))
|
|
||||||
(zero? (system* "patch" "-p1" "--force"
|
|
||||||
"--input" patch))))))
|
|
||||||
'())
|
|
||||||
|
|
||||||
(add-after
|
(add-after
|
||||||
'unpack 'patch-create_test_cases
|
'unpack 'patch-create_test_cases
|
||||||
(lambda _
|
(lambda _
|
||||||
|
@ -288,7 +270,6 @@ also known as DXTn or DXTC) for Mesa.")
|
||||||
'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 ((s2tc (assoc-ref inputs "s2tc"))
|
||||||
(udev (assoc-ref inputs "udev"))
|
|
||||||
(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.
|
||||||
|
@ -297,10 +278,6 @@ also known as DXTn or DXTC) for Mesa.")
|
||||||
"src/mesa/main/texcompress_s3tc.c")
|
"src/mesa/main/texcompress_s3tc.c")
|
||||||
(("\"libtxc_dxtn\\.so")
|
(("\"libtxc_dxtn\\.so")
|
||||||
(string-append "\"" s2tc "/lib/libtxc_dxtn.so")))
|
(string-append "\"" s2tc "/lib/libtxc_dxtn.so")))
|
||||||
(substitute* "src/loader/loader.c"
|
|
||||||
(("udev_handle = dlopen\\(name")
|
|
||||||
(string-append "udev_handle = dlopen(\""
|
|
||||||
udev "/lib/libudev.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")))
|
||||||
|
|
Loading…
Reference in New Issue