From aea3ec0f720c53b9897d87502a8fbdb6e6f10d11 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 5 Oct 2018 14:10:21 +0200 Subject: gnu: mesa: Update to 18.2.2. * gnu/packages/gl.scm (mesa): Update to 18.2.2. [inputs]: Add libxrandr. [arguments]: Remove "--enable-texture-float" argument (enabled by default now). --- gnu/packages/gl.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 5592e5fe67..c005a6fd24 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 "18.1.5") + (version "18.2.2") (source (origin (method url-fetch) @@ -236,7 +236,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1sldv7l3g6jfx0yn16kvxlik1qiy037lypdqpvsqc0v6lvqydnv9")) + "1i3ky3d210vi3f5hlr9la1kspdyv093npndxsbzdklw95aqq5fn3")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) @@ -256,6 +256,7 @@ also known as DXTn or DXTC) for Mesa.") ("libva" ,(force libva-without-mesa)) ("libxml2" ,libxml2) ;; TODO: Add 'libxml2-python' for OpenGL ES 1.1 and 2.0 support + ("libxrandr" ,libxrandr) ("libxvmc" ,libxvmc) ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") @@ -293,9 +294,6 @@ also known as DXTn or DXTC) for Mesa.") "--enable-gles2" "--enable-gbm" "--enable-shared-glapi" - ;; Without floating point texture support, drivers such as Nouveau - ;; are stuck at OpenGL 2.1 instead of OpenGL 3.0+. - "--enable-texture-float" ;; Enable Vulkan on i686-linux and x86-64-linux. ,@(match (%current-system) -- cgit 1.4.1 From 77ec9b983087900d85b8de704902ff2c1afcb6c0 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 19 Oct 2018 18:35:50 +0200 Subject: gnu: mesa: Update to 18.2.3. * gnu/packages/gl.scm (mesa): Update to 18.2.3. --- 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 c005a6fd24..0c64e05090 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 "18.2.2") + (version "18.2.3") (source (origin (method url-fetch) @@ -236,7 +236,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1i3ky3d210vi3f5hlr9la1kspdyv093npndxsbzdklw95aqq5fn3")) + "00rrg8i1ykwvrg94gcsvjy1l9ih8bqafkq9x122h3rkk5cvmnjcz")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) -- cgit 1.4.1 From b07724a98b3fcdb28d5f870cd0a840f50d787dc2 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 4 Dec 2018 08:37:21 +0100 Subject: gnu: mesa: Update to 18.2.6. * gnu/packages/gl.scm (mesa): Update to 18.2.6. --- 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 9ae7e5613e..9c8ab180a4 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -220,7 +220,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "18.2.3") + (version "18.2.6") (source (origin (method url-fetch) @@ -232,7 +232,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "00rrg8i1ykwvrg94gcsvjy1l9ih8bqafkq9x122h3rkk5cvmnjcz")) + "04nwxykmc80gicmal0zkk8is34rmbqawmfckirqhrps9h97zmfly")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) -- cgit 1.4.1 From 54d860cc1732f46f893f1e788e95af4c4ea2d986 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 16:48:55 +0100 Subject: gnu: libepoxy: Update to 1.5.3. * gnu/packages/gl.scm (libepoxy): Update to 1.5.3. [build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Delete 'bootstrap' phase. --- gnu/packages/gl.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 9c8ab180a4..3968e4379d 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -53,6 +53,7 @@ #:use-module (guix build utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix build-system meson) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) @@ -545,7 +546,7 @@ OpenGL graphics API.") (define-public libepoxy (package (name "libepoxy") - (version "1.5.2") + (version "1.5.3") (source (origin (method url-fetch) (uri (string-append @@ -553,10 +554,11 @@ OpenGL graphics API.") version "/libepoxy-" version ".tar.xz")) (sha256 (base32 - "1n57xj5i6giw4mp5s59w1m9bm33sd6gjg7r00dzzvcwya6326mm9")))) + "0ga3qjv50x37my6pw5xr14g5n6z78hy5s8s06kays8c3ab2mha80")))) (arguments `(#:phases (modify-phases %standard-phases + (delete 'bootstrap) (add-before 'configure 'patch-paths (lambda* (#:key inputs #:allow-other-keys) @@ -568,7 +570,7 @@ OpenGL graphics API.") (("libGL.so.1") (string-append mesa "/lib/libGL.so.1")) (("libEGL.so.1") (string-append mesa "/lib/libEGL.so.1"))) #t)))))) - (build-system gnu-build-system) + (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) -- cgit 1.4.1 From 730a4728cc38799f9683bde5a0711ab10d42a9f8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 17:38:22 +0100 Subject: gnu: mesa: Build against the regular LLVM package. * gnu/packages/gl.scm (mesa)[inputs]: Change LLVM-WITHOUT-RTTI to LLVM. * gnu/packages/llvm.scm (llvm-without-rtti): Remove variable. --- gnu/packages/gl.scm | 3 +-- gnu/packages/llvm.scm | 20 -------------------- 2 files changed, 1 insertion(+), 22 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 3968e4379d..1bf53bcbb4 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -257,8 +257,7 @@ also known as DXTn or DXTC) for Mesa.") ("libxvmc" ,libxvmc) ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - ;; FIXME: Change to 'llvm' in the next rebuild cycle. - `(("llvm" ,llvm-without-rtti))) + `(("llvm" ,llvm))) (_ `())) ("makedepend" ,makedepend) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 8a9d1d312b..4be86f3d21 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -95,26 +95,6 @@ languages is in development. The compiler infrastructure includes mirror sets of programming tools as well as libraries with equivalent functionality.") (license license:ncsa))) -;; FIXME: This package is here to prevent many rebuilds on x86_64 and i686 -;; from commit fc9dbf41311d99d0fd8befc789ea7c0e35911890. Update users of -;; this in the next rebuild cycle. -(define-public llvm-without-rtti - (package - (inherit llvm) - (arguments - `(#:configure-flags '("-DCMAKE_SKIP_BUILD_RPATH=FALSE" - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE" - "-DBUILD_SHARED_LIBS:BOOL=TRUE" - "-DLLVM_ENABLE_FFI:BOOL=TRUE" - "-DLLVM_INSTALL_UTILS=ON") - #:build-type "Release" - #:phases (modify-phases %standard-phases - (add-before 'build 'shared-lib-workaround - (lambda _ - (setenv "LD_LIBRARY_PATH" - (string-append (getcwd) "/lib")) - #t))))))) - (define* (clang-runtime-from-llvm llvm hash #:optional (patches '())) (package -- cgit 1.4.1 From 17c3e0d85d9c1a6b4c09d09dd9238297b6165a2f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 12 Dec 2018 08:42:55 +0100 Subject: gnu: mesa: Update to 18.3.1. * gnu/packages/gl.scm (mesa): Update to 18.3.1. [native-inputs]: Use python instead of python-2. Use python-mako instead of python2-mako. Signed-off-by: Marius Bakke --- gnu/packages/gl.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 1bf53bcbb4..1c2632b9aa 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -221,7 +221,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "18.2.6") + (version "18.3.1") (source (origin (method url-fetch) @@ -233,7 +233,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "04nwxykmc80gicmal0zkk8is34rmbqawmfckirqhrps9h97zmfly")) + "0qyw9dj2p9n91qzc4ylck2an7ibssjvzi2bjcpv2ajk851yq47sv")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) @@ -265,8 +265,8 @@ also known as DXTn or DXTC) for Mesa.") ("wayland-protocols" ,wayland-protocols))) (native-inputs `(("pkg-config" ,pkg-config) - ("python" ,python-2) - ("python2-mako" ,python2-mako) + ("python" ,python) + ("python-mako" ,python-mako) ("which" ,(@ (gnu packages base) which)))) (arguments `(#:configure-flags -- cgit 1.4.1 From cd9f99f1077a97194d5737c17264b7521723f9ec Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Dec 2018 16:30:29 +0200 Subject: gnu: mesa: Enable more gallium drivers for armhf and aarch64. * gnu/packages/gl.scm (mesa)[arguments]: Enable more etnaviv-based drivers on armhf-linux and aarch64-linux. --- gnu/packages/gl.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 1c2632b9aa..719c185482 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -271,12 +271,9 @@ also known as DXTn or DXTC) for Mesa.") (arguments `(#:configure-flags '(,@(match (%current-system) - ("armhf-linux" - ;; TODO: Add etnaviv,imx when libdrm supports etnaviv. - '("--with-gallium-drivers=freedreno,nouveau,r300,r600,swrast,tegra,vc4,virgl")) - ("aarch64-linux" + ((or "armhf-linux" "aarch64-linux") ;; TODO: Fix svga driver for aarch64 and armhf. - '("--with-gallium-drivers=freedreno,nouveau,pl111,r300,r600,swrast,tegra,vc4,virgl")) + '("--with-gallium-drivers=etnaviv,freedreno,imx,nouveau,pl111,r300,r600,swrast,tegra,v3d,vc4,virgl")) (_ '("--with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast,virgl"))) ;; Enable various optional features. TODO: opencl requires libclc, -- cgit 1.4.1 From bbc94a08f3d752b1d6221f610260912760264efb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 25 Dec 2018 10:28:36 +0200 Subject: gnu: glew: Update to 2.1.0. * gnu/packages/gl.scm (glew): Update to 2.1.0. --- 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 719c185482..2c64b0bc9c 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -452,14 +452,14 @@ glxgears, glxheads, and glxinfo.") (define-public glew (package (name "glew") - (version "2.0.0") + (version "2.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/glew/glew/" version "/glew-" version ".tgz")) (sha256 (base32 - "0r37fg2s1f0jrvwh6c8cz5x6v4wqmhq42qm15cs9qs349q5c6wn5")) + "159wk5dc0ykjbxvag5i1m2mhp23zkk6ra04l26y3jc3nwvkr3ph4")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1