From c9cfcd5159f4a67ca38ccdef5398c0a601f167be Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 15 Sep 2020 13:40:26 -0400 Subject: gnu: mesa: Update to 20.1.8. * gnu/packages/gl.scm (mesa): Update to 20.1.8. (mesa-20.0.8): Remove variable. --- gnu/packages/gl.scm | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index fb33bd7f6d..e033ef721e 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Giacomo Leidi +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -233,14 +234,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "20.0.7") - - ;; Mesa 20.0.5 through 20.0.7 has problems with some graphic drivers, so - ;; we need this newer version. - ;; https://gitlab.freedesktop.org/mesa/mesa/-/issues/2882 - ;; https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4861 - (replacement mesa-20.0.8) - + (version "20.1.8") (source (origin (method url-fetch) @@ -252,7 +246,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "0y517qpdg6v6dsdgzb365p03m30511sbyh8pq0mcvhvjwy7javpy")) + "1252mgwiy05nz8mm4gjkzmnjfvdz5yv1shnsr837cdnan86dvsad")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system meson-build-system) @@ -446,21 +440,6 @@ device drivers allows Mesa to be used in many different environments ranging from software emulation to complete hardware acceleration for modern GPUs.") (license license:x11))) -;; Replacement package to fix . -(define mesa-20.0.8 - (package - (inherit mesa) - (version "20.0.8") - (source (origin - (inherit (package-source mesa)) - (uri (list (string-append "https://mesa.freedesktop.org/archive/" - "mesa-" version ".tar.xz") - (string-append "ftp://ftp.freedesktop.org/pub/mesa/" - "mesa-" version ".tar.xz"))) - (sha256 - (base32 - "0v0bfh3ay07s6msxmklvwfaif0q02kq2yhy65fdhys49vw8c1w3c")))))) - (define-public mesa-opencl (package/inherit mesa (name "mesa-opencl") -- cgit 1.4.1