From 584f2e1bc14fee5fb823e1b3bca279987d15d38d Mon Sep 17 00:00:00 2001 From: David Craven Date: Mon, 18 Jul 2016 18:55:46 +0200 Subject: gnu: gl: Change 'l:' prefix to 'license:'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gl.scm: Change #:prefix l: to #:prefix license:. Signed-off-by: Ludovic Courtès --- gnu/packages/gl.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 907e3bf30a..b774c4c592 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -22,7 +22,7 @@ (define-module (gnu packages gl) #:use-module (ice-9 match) #:use-module (guix build utils) - #:use-module ((guix licenses) #:prefix l:) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) @@ -71,7 +71,7 @@ matrices for creating perspective and orthographic projections, positioning a camera, and selection/picking, Rendering of disk, cylinder, and sphere primitives, Interpreting OpenGL error values as ASCII text.") - (license (l:x11-style "http://directory.fsf.org/wiki/License:SGIFreeBv2")))) + (license (license:x11-style "http://directory.fsf.org/wiki/License:SGIFreeBv2")))) (define-public freeglut (package @@ -112,7 +112,7 @@ GLUT (and hence freeglut) allows the user to create and manage windows containing OpenGL contexts on a wide range of platforms and also read the mouse, keyboard and joystick functions. Freeglut is released under the X-Consortium license.") - (license l:x11))) + (license license:x11))) (define-public ftgl (package @@ -138,7 +138,7 @@ the X-Consortium license.") "FTGL is a font rendering library for OpenGL applications. Supported rendering modes are: Bitmaps, Anti-aliased pixmaps, Texture maps, Outlines, Polygon meshes, and Extruded polygon meshes.") - (license l:x11))) + (license license:x11))) (define-public s2tc (package @@ -170,7 +170,7 @@ Polygon meshes, and Extruded polygon meshes.") (description "S2TC is a patent-free implementation of S3 Texture Compression (S3TC, also known as DXTn or DXTC) for Mesa.") - (license l:expat))) + (license license:expat))) ;;; Mesa needs LibVA headers to build its Gallium-based VA API implementation; ;;; LibVA itself depends on Mesa. We use the following to solve the circular @@ -287,7 +287,7 @@ also known as DXTn or DXTC) for Mesa.") a system for rendering interactive 3D graphics. A variety of device drivers allows Mesa to be used in many different environments ranging from software emulation to complete hardware acceleration for modern GPUs.") - (license l:x11))) + (license license:x11))) (define-public mesa-headers (package @@ -355,7 +355,7 @@ emulation to complete hardware acceleration for modern GPUs.") "The mesa-utils package contains several utility tools for Mesa: glxdemo, glxgears, glxheads, and glxinfo.") ;; glxdemo is public domain; others expat. - (license (list l:expat l:public-domain)))) + (license (list license:expat license:public-domain)))) (define-public glew (package @@ -399,7 +399,7 @@ glxgears, glxheads, and glxinfo.") loading library. GLEW provides efficient run-time mechanisms for determining which OpenGL extensions are supported on the target platform. OpenGL core and extension functionality is exposed in a single header file.") - (license l:bsd-3))) + (license license:bsd-3))) (define-public guile-opengl (package @@ -445,7 +445,7 @@ extension functionality is exposed in a single header file.") (description "Guile-OpenGL is a library for Guile that provides bindings to the OpenGL graphics API.") - (license l:lgpl3+))) + (license license:lgpl3+))) (define-public libepoxy (package @@ -502,7 +502,7 @@ OpenGL graphics API.") (synopsis "A library for handling OpenGL function pointer management") (description "A library for handling OpenGL function pointer management.") - (license l:x11))) + (license license:x11))) (define-public soil (package @@ -544,4 +544,4 @@ OpenGL graphics API.") (description "SOIL is a tiny C library used primarily for uploading textures into OpenGL.") - (license l:public-domain))) + (license license:public-domain))) -- cgit v1.2.3 From 3a92a5b36d68ad1edab6df3a9d58b841f218f95b Mon Sep 17 00:00:00 2001 From: David Craven Date: Mon, 18 Jul 2016 18:55:45 +0200 Subject: gnu: Order module imports in (gnu packages gl) alphabetically. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gl.scm: Order module imports alphabetically. Signed-off-by: Ludovic Courtès --- gnu/packages/gl.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index b774c4c592..4ac926ed4a 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -20,29 +20,29 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages gl) - #:use-module (ice-9 match) - #:use-module (guix build utils) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu) - #:use-module (guix build-system cmake) - #:use-module (guix packages) - #:use-module (guix utils) #:use-module (gnu packages autotools) #:use-module (gnu packages bison) #:use-module (gnu packages flex) - #:use-module (gnu packages pkg-config) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) + #:use-module (gnu packages guile) #:use-module (gnu packages linux) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages xorg) - #:use-module (gnu packages xml) - #:use-module (gnu packages fontutils) - #:use-module (gnu packages guile) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages zip)) + #:use-module (gnu packages xml) + #:use-module (gnu packages xorg) + #:use-module (gnu packages zip) + #:use-module (guix download) + #:use-module (guix build utils) + #:use-module (guix build-system gnu) + #:use-module (guix build-system cmake) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (ice-9 match)) (define-public glu (package -- cgit v1.2.3 From 7fe3f8cf6ef0fb220267caca616aadc5d5e28608 Mon Sep 17 00:00:00 2001 From: David Craven Date: Mon, 18 Jul 2016 18:55:50 +0200 Subject: gnu: mesa-utils: Update to 8.3.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gl.scm (mesa-utils): Update to 8.3.0. Signed-off-by: Ludovic Courtès --- gnu/packages/gl.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 4ac926ed4a..7fa79bbde3 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -317,12 +317,12 @@ emulation to complete hardware acceleration for modern GPUs.") (method url-fetch) (uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/demos/" version "/mesa-demos-" version ".tar.bz2")) - (sha256 (base32 "14msj0prbl3ljwd24yaqv9pz1xzicdmqgg616xxlppbdh6syrgz4")))) + (sha256 (base32 "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1")))) (define-public mesa-utils (package (name "mesa-utils") - (version "8.2.0") + (version "8.3.0") (source (mesa-demos-source version)) (build-system gnu-build-system) (inputs @@ -332,12 +332,7 @@ emulation to complete hardware acceleration for modern GPUs.") (native-inputs `(("pkg-config" ,pkg-config))) (arguments - '(;; XXX: fails to build against latest mesa: - ;; eglut.c: error: 'EGL_SCREEN_BIT_MESA' undeclared - ;; - ;; - #:configure-flags '("--disable-egl") - #:phases + '(#:phases (modify-phases %standard-phases (replace 'install -- cgit v1.2.3