From 47406a929058d11330a6833adafe5513cdd25b5c Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 15 Aug 2019 15:36:12 +0200 Subject: gnu: mesa: Remove unnecessary inputs. * gnu/packages/gl.scm (mesa)[native-inputs]: Remove unnecessary inputs. --- gnu/packages/gl.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index a2658a6789..8a3a1f1bd8 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -272,9 +272,7 @@ also known as DXTn or DXTC) for Mesa.") ("gettext" ,gettext-minimal) ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - `(("glslang" ,glslang) - ("vulkan-headers" ,vulkan-headers) - ("vulkan-loader" ,vulkan-loader))) + `(("glslang" ,glslang))) (_ `())) ("pkg-config" ,pkg-config) -- cgit 1.4.1 From d111ae4f57ffe24686c4cfe79cf36fb768571b6e Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 29 Aug 2019 15:43:02 +0200 Subject: gnu: mesa: Update to 19.1.5. * gnu/packages/gl.scm (mesa): Update to 19.1.5. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 8a3a1f1bd8..2fa210fb37 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 "19.1.4") + (version "19.1.5") (source (origin (method url-fetch) @@ -236,7 +236,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1yvb7ja09i36zjifpyrf8jmbm9z0wqs2w3x8dlmxkkzdv6knilm6")) + "1d3frncljickn5yi2ch1w2phwxhxpi6diyac3cbin9f76m7f2m3v")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system meson-build-system) -- cgit 1.4.1 From 178611c8334e5448591350f475d348b33bf66f65 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 12 Oct 2019 20:54:27 +0200 Subject: gnu: mesa: Update to 19.2.1. * gnu/packages/gl.scm (mesa): Update to 19.2.1. [native-inputs]: Replace PYTHON with PYTHON-WRAPPER. --- gnu/packages/gl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 794bf5993d..81f808017d 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -229,7 +229,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "19.1.5") + (version "19.2.1") (source (origin (method url-fetch) @@ -241,7 +241,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1d3frncljickn5yi2ch1w2phwxhxpi6diyac3cbin9f76m7f2m3v")) + "1s81kwcjkkahnf5y5mshmd3q9j057hhsai7awpq6yb6im2hkriac")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system meson-build-system) @@ -281,7 +281,7 @@ also known as DXTn or DXTC) for Mesa.") (_ `())) ("pkg-config" ,pkg-config) - ("python" ,python) + ("python" ,python-wrapper) ("python-mako" ,python-mako) ("which" ,(@ (gnu packages base) which)))) (arguments -- cgit 1.4.1 From 2737c7fe8a24f18a7f1495781dbe34c4b8af5bed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 14 Oct 2019 18:16:21 +0200 Subject: gnu: mesa: Fix test failure on 32-bit systems. * gnu/packages/patches/mesa-timespec-test-32bit.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gl.scm (mesa)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/gl.scm | 3 ++- gnu/packages/patches/mesa-timespec-test-32bit.patch | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/mesa-timespec-test-32bit.patch (limited to 'gnu/packages/gl.scm') diff --git a/gnu/local.mk b/gnu/local.mk index addeb82491..b403386d68 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1110,6 +1110,7 @@ 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-timespec-test-32bit.patch \ %D%/packages/patches/mescc-tools-boot.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ %D%/packages/patches/metabat-fix-compilation.patch \ diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 81f808017d..63e12efe06 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -243,7 +243,8 @@ also known as DXTn or DXTC) for Mesa.") (base32 "1s81kwcjkkahnf5y5mshmd3q9j057hhsai7awpq6yb6im2hkriac")) (patches - (search-patches "mesa-skip-disk-cache-test.patch")))) + (search-patches "mesa-skip-disk-cache-test.patch" + "mesa-timespec-test-32bit.patch")))) (build-system meson-build-system) (propagated-inputs `(;; The following are in the Requires.private field of gl.pc. diff --git a/gnu/packages/patches/mesa-timespec-test-32bit.patch b/gnu/packages/patches/mesa-timespec-test-32bit.patch new file mode 100644 index 0000000000..3e4890f3a4 --- /dev/null +++ b/gnu/packages/patches/mesa-timespec-test-32bit.patch @@ -0,0 +1,17 @@ +Fix a test failure on 32-bit systems. + +Taken from upstream: +https://gitlab.freedesktop.org/mesa/mesa/commit/dd1dba80b9ee74ec8b90761285a8262e374bf8ef + +diff --git a/src/util/tests/timespec/timespec_test.cpp b/src/util/tests/timespec/timespec_test.cpp +--- a/src/util/tests/timespec/timespec_test.cpp ++++ b/src/util/tests/timespec/timespec_test.cpp +@@ -206,7 +206,7 @@ TEST(timespec_test, timespec_from_nsec) + + timespec_from_nsec(&a, UINT64_MAX); + EXPECT_EQ(a.tv_nsec, UINT64_MAX % NSEC_PER_SEC); +- EXPECT_EQ(a.tv_sec, UINT64_MAX / NSEC_PER_SEC); ++ EXPECT_EQ(a.tv_sec, (time_t)(UINT64_MAX / NSEC_PER_SEC)); + } + + TEST(timespec_test, timespec_from_usec) -- cgit 1.4.1