From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Craven Subject: [PATCH 5/6] gnu: mesa: Update to 12.0.0. Date: Sat, 9 Jul 2016 14:50:10 +0200 Message-ID: <20160709125011.24587-6-david@craven.ch> References: <20160709125011.24587-1-david@craven.ch> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:35457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLrid-0005Yj-C0 for guix-devel@gnu.org; Sat, 09 Jul 2016 08:50:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bLria-0004a7-S8 for guix-devel@gnu.org; Sat, 09 Jul 2016 08:50:50 -0400 Received: from so254-10.mailgun.net ([198.61.254.10]:49420) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLriZ-0004Ye-Ke for guix-devel@gnu.org; Sat, 09 Jul 2016 08:50:48 -0400 In-Reply-To: <20160709125011.24587-1-david@craven.ch> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org Cc: David Craven * gnu/packages/gl.scm (mesa): Update to 12.0.0. * gnu/packages/gl.scm (mesa): Enable virtio gallium driver. * gnu/packages/gl.scm (mesa): Enable configure-flags required by wayland. --- gnu/packages/gl.scm | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 4ac926e..5e4fca9 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -192,7 +192,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "11.0.9") + (version "12.0.0") (source (origin (method url-fetch) @@ -200,7 +200,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz")) (sha256 (base32 - "009b3nq8ly5nzy9cxi9cxf4qasrhggjz0v0q87rwq5kaqvqjy9m1")))) + "1ikxaj4avz29ch403bblq3l47g1r6hp4har94i8r664k44jw1400")))) (build-system gnu-build-system) (propagated-inputs `(("glproto" ,glproto) @@ -213,31 +213,37 @@ also known as DXTn or DXTC) for Mesa.") ("libxxf86vm" ,libxxf86vm))) ;; TODO: Add vdpau. (inputs - `(("udev" ,eudev) + `(("expat" ,expat) ("dri2proto" ,dri2proto) ("dri3proto" ,dri3proto) - ("presentproto" ,presentproto) - ("expat" ,expat) ("libva" ,(force libva-without-mesa)) ("libxml2" ,libxml2) ;; TODO: Add 'libxml2-python' for OpenGL ES 1.1 and 2.0 support ("libxvmc" ,libxvmc) ("makedepend" ,makedepend) - ("s2tc" ,s2tc))) + ("presentproto" ,presentproto) + ("s2tc" ,s2tc) + ("udev" ,eudev) + ("wayland" ,wayland))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("python" ,python-2))) (arguments `(#:configure-flags '(;; drop r300 from default gallium drivers, as it requires llvm - "--with-gallium-drivers=r600,svga,swrast,nouveau" + "--with-gallium-drivers=r600,svga,swrast,nouveau,virgl" ;; Enable various optional features. TODO: opencl requires libclc, ;; omx requires libomxil-bellagio - "--with-egl-platforms=x11,drm" + "--with-egl-platforms=x11,drm,wayland" "--enable-glx-tls" ;Thread Local Storage, improves performance ;; "--enable-opencl" ;; "--enable-omx" "--enable-osmesa" "--enable-xa" + ;; features required by wayland + "--enable-gles2" + "--enable-gbm" + "--enable-shared-glapi" ;; on non-intel systems, drop i915 and i965 ;; from the default dri drivers @@ -249,8 +255,10 @@ also known as DXTn or DXTC) for Mesa.") #:phases (alist-cons-after 'unpack 'patch-create_test_cases (lambda _ - (substitute* "src/glsl/tests/lower_jumps/create_test_cases.py" - (("/usr/bin/env bash") (which "bash")))) + (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")))) (alist-cons-before 'build 'fix-dlopen-libnames (lambda* (#:key inputs outputs #:allow-other-keys) -- 2.9.0