From 301b2e74f986385664153e6e770e238b351f5cf0 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 26 Jun 2019 08:20:27 +0200 Subject: gnu: mesa: Update to 19.1.1. * gnu/packages/gl.scm (mesa): Update to 19.1.1. [native-inputs]: Add glslang, vulkan-headers, vulkan-loader for i686-linux and x86_64-linux. [arguments]: Enable "-Dvulkan-overlay-layer" configuration flag for i686-linux and x86_64-linux. --- gnu/packages/gl.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 96e7fc7165..f0454a6fe3 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -46,6 +46,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages tls) #:use-module (gnu packages video) + #:use-module (gnu packages vulkan) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -223,7 +224,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "19.0.4") + (version "19.1.1") (source (origin (method url-fetch) @@ -235,7 +236,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "0iyffj3xd7f0vsayirswh6aia37ba26hkihpz273hxwd8hpz7y9r")) + "10amy5sdmpjbskr3xazgk0jyli8xpgi0y1nsmjr76hx8nhb4n4bj")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system meson-build-system) @@ -269,6 +270,13 @@ also known as DXTn or DXTC) for Mesa.") `(("bison" ,bison) ("flex" ,flex) ("gettext" ,gettext-minimal) + ,@(match (%current-system) + ((or "x86_64-linux" "i686-linux") + `(("glslang" ,glslang) + ("vulkan-headers" ,vulkan-headers) + ("vulkan-loader" ,vulkan-loader))) + (_ + `())) ("pkg-config" ,pkg-config) ("python" ,python) ("python-mako" ,python-mako) @@ -305,6 +313,13 @@ also known as DXTn or DXTC) for Mesa.") (_ '("-Dvulkan-drivers=auto"))) + ;; Enable the Vulkan overlay layer on i686-linux and x86-64-linux. + ,@(match (%current-system) + ((or "x86_64-linux" "i686-linux") + '("-Dvulkan-overlay-layer=true")) + (_ + '(""))) + ;; Also enable the tests. "-Dbuild-tests=true" -- cgit v1.2.3