From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8qQj-0000eY-CM for guix-patches@gnu.org; Thu, 11 May 2017 11:55:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8qQg-0001Vz-TO for guix-patches@gnu.org; Thu, 11 May 2017 11:55:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:36285) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d8qQg-0001Vv-PU for guix-patches@gnu.org; Thu, 11 May 2017 11:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d8qQg-0004Ot-JT for guix-patches@gnu.org; Thu, 11 May 2017 11:55:02 -0400 Subject: bug#26887: [PATCH 02/11] gnu: mesa: Update to 17.0.4. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8qPb-00089w-TP for guix-patches@gnu.org; Thu, 11 May 2017 11:53:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8qPY-0000y2-EH for guix-patches@gnu.org; Thu, 11 May 2017 11:53:55 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:60635 helo=mail.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d8qPY-0000x6-3h for guix-patches@gnu.org; Thu, 11 May 2017 11:53:52 -0400 From: Kei Kebreau Date: Thu, 11 May 2017 11:30:12 -0400 Message-Id: <20170511153021.14972-2-kei@openmailbox.org> In-Reply-To: <20170511153021.14972-1-kei@openmailbox.org> References: <20170511153021.14972-1-kei@openmailbox.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26887@debbugs.gnu.org From: Marius Bakke * gnu/packages/patches/mesa-skip-disk-cache-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gl.scm (mesa): Update to 17.0.4. [source]: Adapt URI to new directory structure. [arguments]: End phases on #t. Remove stray whitespaces. [home-page]: Use HTTPS. --- gnu/local.mk | 1 + gnu/packages/gl.scm | 23 +++++++++++++--------- .../patches/mesa-skip-disk-cache-test.patch | 20 +++++++++++++++++++ 3 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/mesa-skip-disk-cache-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5822add4c..552dd0549 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -775,6 +775,7 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ %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/metabat-remove-compilation-date.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index bb2eb768e..f43f46439 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -217,17 +217,20 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "13.0.5") + (version "17.0.4") (source (origin (method url-fetch) - (uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/" - version "/mesa-" version ".tar.xz")) + (uri (list (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 - "11zgynii1wz17131ml1mmblpwib8m88zz2jwi5h5llh1r3iagkmz")) + "0im3ca1vwwmkjf5w761vh7vabr4vrrdxpckr0wm974x18n2xqs8j")) (patches - (search-patches "mesa-wayland-egl-symbols-check-mips.patch")))) + (search-patches "mesa-wayland-egl-symbols-check-mips.patch" + "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) (propagated-inputs `(("glproto" ,glproto) @@ -281,7 +284,7 @@ also known as DXTn or DXTC) for Mesa.") ;; Without floating point texture support, drivers such as Nouveau ;; are stuck at OpenGL 2.1 instead of OpenGL 3.0+. "--enable-texture-float" - + ;; Also enable the tests. "--enable-gallium-tests" @@ -301,7 +304,8 @@ also known as DXTn or DXTC) for Mesa.") (substitute* "src/compiler/glsl/tests/lower_jumps/create_test_cases.py" (("/usr/bin/env bash") (which "bash"))) (substitute* "src/intel/genxml/gen_pack_header.py" - (("/usr/bin/env python2") (which "python"))))) + (("/usr/bin/env python2") (which "python"))) + #t)) (add-before 'build 'fix-dlopen-libnames (lambda* (#:key inputs outputs #:allow-other-keys) @@ -325,8 +329,9 @@ also known as DXTn or DXTC) for Mesa.") ;; it's never installed since Mesa removed its ;; egl_gallium support. (("\"gbm_dri\\.so") - (string-append "\"" out "/lib/dri/gbm_dri.so"))))))))) - (home-page "http://mesa3d.org/") + (string-append "\"" out "/lib/dri/gbm_dri.so"))) + #t)))))) + (home-page "https://mesa3d.org/") (synopsis "OpenGL implementation") (description "Mesa is a free implementation of the OpenGL specification - a system for rendering interactive 3D graphics. A variety of device drivers diff --git a/gnu/packages/patches/mesa-skip-disk-cache-test.patch b/gnu/packages/patches/mesa-skip-disk-cache-test.patch new file mode 100644 index 000000000..437711047 --- /dev/null +++ b/gnu/packages/patches/mesa-skip-disk-cache-test.patch @@ -0,0 +1,20 @@ +disk_cache_create() here looks up the users home directory from +which resolves to "/" in the build environment. I could not find an easy +way to set the home directory to something else, so we disable this test +for now. + +--- a/src/compiler/glsl/tests/cache_test.c ++++ b/src/compiler/glsl/tests/cache_test.c +@@ -137,11 +137,6 @@ + unsetenv("MESA_GLSL_CACHE_DIR"); + unsetenv("XDG_CACHE_HOME"); + +- cache = disk_cache_create(); +- expect_non_null(cache, "disk_cache_create with no environment variables"); +- +- disk_cache_destroy(cache); +- + /* Test with XDG_CACHE_HOME set */ + setenv("XDG_CACHE_HOME", CACHE_TEST_TMP "/xdg-cache-home", 1); + cache = disk_cache_create(); + -- 2.13.0