From b786aaa2f8353d6bf9fbcf3b8ce77af765392ed5 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 22 May 2018 02:22:30 +0200 Subject: [PATCH] gnu: mesa: Update to 18.0.4. * gnu/packages/gl.scm (mesa): Update to 18.0.4. [source]: Remove mesa-wayland-egl-symbols-check-mips.patch. [arguments]: Remove wayland from --with-platforms configure flag. * gnu/local.mk: Remove mesa-wayland-egl-symbols-check-mips.patch. * gnu/packages/patches/mesa-wayland-egl-symbols-check-mips.patch: Remove file. --- gnu/local.mk | 1 - gnu/packages/gl.scm | 9 ++++----- .../mesa-wayland-egl-symbols-check-mips.patch | 15 --------------- 3 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 gnu/packages/patches/mesa-wayland-egl-symbols-check-mips.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7b8ddad83..7b0de9e10 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -917,7 +917,6 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ %D%/packages/patches/mesa-skip-disk-cache-test.patch \ - %D%/packages/patches/mesa-wayland-egl-symbols-check-mips.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ %D%/packages/patches/metabat-fix-compilation.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 441d4646e..dcd647202 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -224,7 +224,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "18.0.2") + (version "18.0.4") (source (origin (method url-fetch) @@ -236,10 +236,9 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1cz7p4b4yy201djzv3s28zx27f5cqwv0zgzqp5lcaba8d2bibylq")) + "03wjlb5qy1mn8d6zm0q1pq35x60agrfxyh9bmq6w59ghrvkwyfqz")) (patches - (search-patches "mesa-wayland-egl-symbols-check-mips.patch" - "mesa-skip-disk-cache-test.patch")))) + (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) (propagated-inputs `(;; The following are in the Requires.private field of gl.pc. @@ -284,7 +283,7 @@ also known as DXTn or DXTC) for Mesa.") '("--with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast,virgl"))) ;; Enable various optional features. TODO: opencl requires libclc, ;; omx requires libomxil-bellagio - "--with-platforms=x11,drm,wayland,surfaceless" + "--with-platforms=x11,drm,surfaceless" "--enable-glx-tls" ;Thread Local Storage, improves performance ;; "--enable-opencl" ;; "--enable-omx" diff --git a/gnu/packages/patches/mesa-wayland-egl-symbols-check-mips.patch b/gnu/packages/patches/mesa-wayland-egl-symbols-check-mips.patch deleted file mode 100644 index aa2278697..000000000 --- a/gnu/packages/patches/mesa-wayland-egl-symbols-check-mips.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fix 'wayland-egl-symbols-check' on mips64el-linux, where an additional symbol -(_ftext) is present in libwayland-egl.so. - -Patch by Mark H Weaver - ---- mesa-12.0.1/src/egl/wayland/wayland-egl/wayland-egl-symbols-check.orig 2016-01-18 02:39:25.000000000 -0500 -+++ mesa-12.0.1/src/egl/wayland/wayland-egl/wayland-egl-symbols-check 2016-10-24 16:25:07.110721426 -0400 -@@ -7,6 +7,7 @@ - wl_egl_window_destroy - wl_egl_window_get_attached_size - _fini -+_ftext - _init - EOF - done) -- 2.17.0