From f8cba3ff4fc6aed0c539700aa47b6e8f4c25c34d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 17 Nov 2018 22:54:03 +0100 Subject: gnu: mesa: Stay on RTTI-less LLVM. * gnu/packages/llvm.scm (llvm-without-rtti): New public variable. * gnu/packages/gl.scm (mesa)[inputs]: Use that instead of LLVM. --- gnu/packages/gl.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index b88fab4929..11c89b3d88 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -259,7 +259,8 @@ also known as DXTn or DXTC) for Mesa.") ("libxvmc" ,libxvmc) ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - `(("llvm" ,llvm))) + ;; FIXME: Change to 'llvm' in the next rebuild cycle. + `(("llvm" ,llvm-without-rtti))) (_ `())) ("makedepend" ,makedepend) -- cgit v1.2.3 From 872ea4eb69d16c6d34f31e6cbe91f59e1aa06cba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:31:43 +0100 Subject: gnu: s2tc: Fetch sources from git. * gnu/packages/gl.scm (s2tc)[source]: Fetch from git. --- gnu/packages/gl.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 11c89b3d88..c724fff5f2 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2016 David Thompson ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver ;;; Copyright © 2016 Nils Gillmann -;;; Copyright © 2016, 2017 Ricardo Wurmus +;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2016 David Thompson ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Arun Isaac @@ -49,6 +49,7 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) @@ -177,12 +178,13 @@ Polygon meshes, and Extruded polygon meshes.") (version "1.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/divVerent/s2tc/archive/v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/divVerent/s2tc.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0ibfdib277fhbqvxzan0bmglwnsl1y1rw2g8skvz82l1sfmmn752")) - (file-name (string-append name "-" version ".tar.gz")))) + (base32 "1fg323fk7wlv2xh6lw66wswgcv6qi8aaadk7c28h2f2lj1s7njnf")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 11bbf6324b9662bc765805d53701e380d27fccc4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:32:08 +0100 Subject: gnu: s2tc: Remove custom bootstrap phase. * gnu/packages/gl.scm (s2tc)[arguments]: Remove. --- gnu/packages/gl.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index c724fff5f2..b9dfd7b0f1 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -192,12 +192,6 @@ Polygon meshes, and Extruded polygon meshes.") ("libtool" ,libtool))) (inputs `(("mesa-headers" ,mesa-headers))) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ - (zero? (system* "sh" "autogen.sh"))))))) (home-page "https://github.com/divVerent/s2tc") (synopsis "S3 Texture Compression implementation") (description -- cgit v1.2.3 From bd7daf9c4febd0919101ad8016f28af237887a1c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:32:41 +0100 Subject: gnu: virtualgl: Fetch sources from git. * gnu/packages/gl.scm (virtualgl)[source]: Fetch from git. --- gnu/packages/gl.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index b9dfd7b0f1..06c43a0483 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -725,13 +725,14 @@ mixed vector/bitmap output.") (version "2.6") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/VirtualGL/virtualgl/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/VirtualGL/virtualgl.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1ck1d0w19cgyqvrb9mdlj6l5db90xf18yln71kdninlqxvpgj6h7")))) + "0di2igj2bhwb153fndgxks7y57pyhp0gj31n47j93gb7lxc9qcck")))) (arguments `(#:tests? #f ; no tests are available #:configure-flags (list -- cgit v1.2.3