[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/06: gnu: opensubdiv: Build with a newer version of Mesa.
From: |
guix-commits |
Subject: |
01/06: gnu: opensubdiv: Build with a newer version of Mesa. |
Date: |
Thu, 13 Feb 2020 11:02:41 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit 8ae17933e2bdffe21351cfa664ac9773125c674b
Author: Marius Bakke <address@hidden>
AuthorDate: Thu Feb 13 16:41:35 2020 +0100
gnu: opensubdiv: Build with a newer version of Mesa.
* gnu/packages/gl.scm (mesa-19.3.3): New public variable.
* gnu/packages/graphics.scm (opensubdiv)[inputs]: Add it.
---
gnu/packages/gl.scm | 19 +++++++++++++++++++
gnu/packages/graphics.scm | 7 +++++--
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index d0718d5..e610fe1 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -11,6 +11,7 @@
;;; Copyright © 2017, 2018, 2019 Rutger Helling <address@hidden>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2019 Pierre Neidhardt <address@hidden>
+;;; Copyright © 2020 Marius Bakke <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -422,6 +423,24 @@ 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)))
+;; Mesa 19.3.2 causes a test failure in some packages, so add this newer
+;; version separately until the next rebuild cycle.
+(define-public mesa-19.3.3
+ (package/inherit
+ mesa
+ (version "19.3.3")
+ (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")
+ (string-append "ftp://ftp.freedesktop.org/pub/mesa/"
+ version "/mesa-" version ".tar.xz")))
+ (sha256
+ (base32
+ "02czqdqf64i3az5p1allnxycyjad3x35cj0hz0017mi5pc84ikl1"))))))
+
(define-public mesa-opencl
(package
(inherit mesa)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 4b6e579..bcdc372 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -16,7 +16,7 @@
;;; Copyright © 2019 Steve Sprang <address@hidden>
;;; Copyright © 2019 John Soo <address@hidden>
;;; Copyright © 2019 Pierre Neidhardt <address@hidden>
-;;; Copyright © 2019 Marius Bakke <address@hidden>
+;;; Copyright © 2019, 2020 Marius Bakke <address@hidden>
;;; Copyright © 2019 Tanguy Le Carrour <address@hidden>
;;;
;;; This file is part of GNU Guix.
@@ -1061,7 +1061,10 @@ requirements.")
(native-inputs
`(("xorg-server" ,xorg-server-for-tests)))
(inputs
- `(("glew" ,glew)
+ `(;; The test suite fails when using Mesa 19.3.2, so we provide this newer
+ ;; version. Remove this input when the 'mesa' package is updated.
+ ("mesa" ,mesa-19.3.3)
+ ("glew" ,glew)
("libxrandr" ,libxrandr)
("libxcursor" ,libxcursor)
("libxinerama" ,libxinerama)
- branch master updated (d81fb2a -> 40bea7f), guix-commits, 2020/02/13
- 02/06: gnu: python-markdown: Update to 3.2., guix-commits, 2020/02/13
- 01/06: gnu: opensubdiv: Build with a newer version of Mesa.,
guix-commits <=
- 03/06: gnu: python2-pbcore: Remove python2-sphinx dependency., guix-commits, 2020/02/13
- 05/06: gnu: wpebackend-fdo: Update to 1.4.1., guix-commits, 2020/02/13
- 06/06: gnu: IlmBase, OpenEXR: Update to 2.4.1., guix-commits, 2020/02/13
- 04/06: gnu: libsecret: Update to 0.20.1., guix-commits, 2020/02/13