From mboxrd@z Thu Jan 1 00:00:00 1970 From: taylanbayirli@gmail.com (Taylan Ulrich =?utf-8?Q?Bay=C4=B1rl=C4=B1?= =?utf-8?Q?=2FKammer?=) Subject: Re: [PATCH] gnu: Add mesa-demos. Date: Tue, 17 Mar 2015 12:15:47 +0100 Message-ID: <87pp876fj0.fsf@taylan.uni.cx> References: <87egos7wfs.fsf@taylan.uni.cx> <87oanvy8je.fsf@gnu.org> <87a8zf7hj9.fsf@taylan.uni.cx> <87twxmpbd7.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXpTV-0006if-Os for guix-devel@gnu.org; Tue, 17 Mar 2015 07:15:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YXpTU-0005xM-3b for guix-devel@gnu.org; Tue, 17 Mar 2015 07:15:53 -0400 In-Reply-To: <87twxmpbd7.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Sun, 15 Mar 2015 15:46:12 +0100") 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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain 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. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0003-gnu-mesa-Propagate-inputs-libxshmfence-and-libxfixes.patch Content-Description: patch1 >From 8d83adfaf2d61531d34b757162a7ef723d78bd7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?= 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 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0004-gnu-Add-mesa-utils.patch Content-Description: patch2 >From 78a255834286d56c6472d25a2092de4fda2179c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?= 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 --=-=-=--