Re: [PATCH] gnu: Add mesa-demos.

[Taylan Ulrich Bayırlı/Kammer]

I noticed that the mesa-demos tarball contains *many* demos which are
probably unneeded by most users, and that the Debian mesa-utils package
merely installs 4 tools.  (The reason I wanted to package this in first
place was just to get glxinfo(1), which is one of these four.)  So I
copied that solution after all.

Updated patches below.  The glproto propagated input is not in any .pc
file so I positioned the comment accordingly.  I don't know why glproto
is propagated; maybe it's obvious for someone who knows X.Org and Mesa
well / the original packager.

>From 8d83adfaf2d61531d34b757162a7ef723d78bd7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <address@hidden>
Date: Fri, 13 Mar 2015 15:57:51 +0100
Subject: [PATCH 3/5] gnu: mesa: Propagate inputs libxshmfence and libxfixes.

* gnu/packages/gl.scm (mesa): Propagate inputs libxshmfence and libxfixes.
---
 gnu/packages/gl.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index d2096b6..4866464 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -170,18 +170,19 @@ also known as DXTn or DXTC) for Mesa.")
     (build-system gnu-build-system)
     (propagated-inputs
       `(("glproto" ,glproto)
+        ;; The following are in the Requires.private field of gl.pc.
         ("libdrm" ,libdrm)
         ("libx11" ,libx11)
         ("libxdamage" ,libxdamage)
+        ("libxfixes" ,libxfixes)
+        ("libxshmfence" ,libxshmfence)
         ("libxxf86vm" ,libxxf86vm)))
     (inputs
       `(("udev" ,eudev)
         ("dri2proto" ,dri2proto)
         ("dri3proto" ,dri3proto)
         ("presentproto" ,presentproto)
-        ("libxshmfence" ,libxshmfence)
         ("expat" ,expat)
-        ("libxfixes" ,libxfixes)
         ("libxml2" ,libxml2)
         ;; TODO: Add 'libva'
         ;; TODO: Add 'libxml2-python' for OpenGL ES 1.1 and 2.0 support
-- 
2.2.1

>From 78a255834286d56c6472d25a2092de4fda2179c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <address@hidden>
Date: Fri, 13 Mar 2015 15:58:25 +0100
Subject: [PATCH 4/5] gnu: Add mesa-utils.

* gnu/packages/gl.scm (mesa-utils): New variable.
(mesa-demos-source): New procedure.
---
 gnu/packages/gl.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 4866464..59500c2 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -260,6 +260,48 @@ emulation to complete hardware acceleration for modern 
GPUs.")
                                                  (assoc-ref outputs "out")
                                                  "/include")))))))))
 
+;;; The mesa-demos distribution contains non-free files, many files with no
+;;; clear license information, and many demos that aren't useful for most
+;;; people, so we just use this for the mesa-utils package below, and possibly
+;;; other packages in the future.  This is modeled after Debian's solution.
+(define (mesa-demos-source version)
+  (origin
+    (method url-fetch)
+    (uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/demos/"; version
+                        "/mesa-demos-" version ".tar.bz2"))
+    (sha256 (base32 "14msj0prbl3ljwd24yaqv9pz1xzicdmqgg616xxlppbdh6syrgz4"))))
+
+(define-public mesa-utils
+  (package
+    (name "mesa-utils")
+    (version "8.2.0")
+    (source (mesa-demos-source version))
+    (build-system gnu-build-system)
+    (inputs
+     `(("mesa" ,mesa)
+       ("glut" ,freeglut)
+       ("glew" ,glew)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace
+          install
+          (lambda* (#:key outputs #:allow-other-keys)
+            (let ((out (assoc-ref outputs "out")))
+              (for-each (lambda (file)
+                          (copy-file file (string-append out "/bin")))
+                        '("src/xdemos/glxdemo" "src/xdemos/glxgears"
+                          "src/xdemos/glxinfo" "src/xdemos/glxheads"))))))))
+    (home-page "http://mesa3d.org/";)
+    (synopsis "Utility tools for Mesa")
+    (description
+     "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))))
+
 (define-public glew
   (package
     (name "glew")
-- 
2.2.1