[PATCH] gnu: add GL

[PATCH] gnu: add GL

[youlysses]

[-- Attachment #1: Type: text/plain, Size: 671 bytes --]

I submitted this yesterday, but it appears it never came through, for some
reason or another ...
--

After many unexpected distractions and the near constant barrage of
questions I released onto #guix, I finally have my first patch
(hopefully) all ready to go!

Like always, if there are any criticisms and/or concerns, feel free to
mention them. It's been a fun learning process so-far and I'm really
looking forward to continuing onward, in the long-run.

Attached is a patch to add gl.scm, a set of a applications, extensions,
utilities, or what have-you, related to Opengl-- that don't really
deserve/fit to be in there own file and/or module.

-- JSG

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Added-gl.scm-to-packages.patch --]
[-- Type: text/x-patch; name="0001-Added-gl.scm-to-packages.patch", Size: 5965 bytes --]

From 08238d180a287cb3b092af0f572d63318d3b1276 Mon Sep 17 00:00:00 2001
From: "Joshua S. Grant" <youlysses@riseup.net>
Date: Sun, 29 Sep 2013 15:49:53 -0500
Subject: [PATCH] Added gl.scm to packages

---
 gnu-system.am       |   1 +
 gnu/packages/gl.scm | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 gnu/packages/gl.scm

diff --git a/gnu-system.am b/gnu-system.am
index 7b67579..1e6584c 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -67,6 +67,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/gettext.scm			\
   gnu/packages/ghostscript.scm			\
   gnu/packages/gkrellm.scm			\
+  gnu/packages/gl.scm				\
   gnu/packages/glib.scm				\
   gnu/packages/global.scm			\
   gnu/packages/gnome.scm			\
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
new file mode 100644
index 0000000..48e33b3
--- /dev/null
+++ b/gnu/packages/gl.scm
@@ -0,0 +1,112 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Joshua S. Grant <youlysses@riseup.net>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages gl)
+   #:use-module ((guix licenses) 
+                  #:renamer (symbol-prefix-proc 'l:))
+   #:use-module (guix packages)
+   #:use-module (guix download)
+   #:use-module (guix build-system gnu)
+   #:use-module (guix packages)
+   #:use-module (gnu packages xorg)
+   #:use-module (gnu packages fontutils))
+
+(define-public glu
+  (package
+    (name "glu")
+    (version "9.0.0")
+    (source (origin
+             (method url-fetch)
+	     (uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/glu/glu-" 
+                                  version ".tar.gz"))
+             (sha256
+	      (base32 "0r72yyhj09x3krn3kn629jqbwyq50ji8w5ri2pn6zwrk35m4g1s3"))))
+    (build-system gnu-build-system)
+    (inputs `(("mesa" ,mesa))) 
+    (home-page "http://www.opengl.org/archives/resources/faq/technical/glu.htm")
+    (synopsis "Mesa OpenGL Utility library")
+    (description 
+     "GLU, or OpenGL Utility Library provides some higher-level functionality 
+not provided by just OpenGL itself. Some of GLU's Features 
+include: Scaling of 2D images and creation of mipmap pyramids, 
+Transformation of object coordinates into device coordinates and 
+vice versa, Support for NURBS surfaces, Support for tessellation 
+of concave or bow tie polygonal primitives, Specialty transformation 
+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"))))
+ 
+(define-public freeglut
+  (package
+    (name "freeglut")
+    (version "2.8.1")
+    (source (origin
+	     (method url-fetch)
+             (uri (string-append "mirror://sourceforge/project/freeglut/freeglut/" 
+                                  version "/freeglut-" version ".tar.gz"))
+             (sha256
+	      (base32 "16lrxxxd9ps9l69y3zsw6iy0drwjsp6m26d1937xj71alqk6dr6x"))))
+    (build-system gnu-build-system)
+    (inputs `(("mesa" ,mesa) 
+              ("libx11" ,libx11)
+              ("libxi" ,libxi)
+              ("libxrandr" ,libxrandr)
+              ("libxxf86vm" ,libxxf86vm) 
+              ("inputproto" ,inputproto)
+              ("xinput" ,xinput)
+              ("glu" ,glu)))
+    (home-page "http://freeglut.sourceforge.net/")
+    (synopsis "Alternative to the OpenGL Utility Toolkit (GLUT)")
+    (description 
+     "Freeglut is a completely Free/OpenSourced alternative to 
+the OpenGL Utility Toolkit (GLUT) library. GLUT was originally 
+written by Mark Kilgard to support the sample programs in the 
+second edition OpenGL 'RedBook'. Since then, GLUT has been used 
+in a wide variety of practical applications because it is simple, 
+widely available and highly portable.
+
+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)))
+
+(define-public ftgl 
+  (package
+    (name "ftgl")
+    (version "2.1.3-rc5") 
+    (source (origin
+	     (method url-fetch)
+             (uri (string-append "mirror://sourceforge/project/ftgl/FTGL%20Source/2.1.3~rc5/ftgl-"
+                                  version ".tar.gz"))
+             (sha256
+              (base32 "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l"))))
+    (build-system gnu-build-system)
+    (inputs `(("freetype" ,freetype)
+              ("libx11" ,libx11)
+              ("mesa" ,mesa)
+              ("glu" ,glu))) 
+    (home-page "http://ftgl.sourceforge.net")                              
+    (synopsis "Font rendering library for OpenGL applications")
+    (description 
+     "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)))
-- 
1.8.3.1

Re: [PATCH] gnu: add GL

[Ludovic Courtès]

Hi!

Thanks for joining the hackathon this week-end!

youlysses@riseup.net skribis:

> Attached is a patch to add gl.scm, a set of a applications, extensions,
> utilities, or what have-you, related to Opengl-- that don't really
> deserve/fit to be in there own file and/or module.

Freeglut still fails to build as you previously reported (did you see my
reply?):

--8<---------------cut here---------------start------------->8---
In file included from freeglut_internal.h:112:0,
                 from freeglut_callbacks.c:29:
/nix/store/ksgcicnwcadglmki5ai1d5xxfhjx52hf-libxi-1.6.1/include/X11/extensions/XInput.h:53:31: fatal error: X11/extensions/XI.h: No such file or directory
--8<---------------cut here---------------end--------------->8---

Ludo’.

Re: [PATCH] gnu: add GL

[Andreas Enge]

On Mon, Sep 30, 2013 at 09:31:48PM +0200, Ludovic Courtès wrote:
> youlysses@riseup.net skribis:
> > Attached is a patch to add gl.scm, a set of a applications, extensions,
> > utilities, or what have-you, related to Opengl-- that don't really
> > deserve/fit to be in there own file and/or module.

When I apply the patch, it creates gl.scm in the main guix directory, not
in gnu/packages.

> Freeglut still fails to build as you previously reported (did you see my
> reply?):

So I suspect you still have the old gnu/packages/gl.scm lying around.

The new one compiles without problems. Congratulations, Joshua!

A tiny point I noticed: Some lines of the file start by a tab; should these
not be replaced by spaces?

Andreas

Re: [PATCH] gnu: add GL

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> On Mon, Sep 30, 2013 at 09:31:48PM +0200, Ludovic Courtès wrote:
>> youlysses@riseup.net skribis:
>> > Attached is a patch to add gl.scm, a set of a applications, extensions,
>> > utilities, or what have-you, related to Opengl-- that don't really
>> > deserve/fit to be in there own file and/or module.
>
> When I apply the patch, it creates gl.scm in the main guix directory, not
> in gnu/packages.
>
>> Freeglut still fails to build as you previously reported (did you see my
>> reply?):
>
> So I suspect you still have the old gnu/packages/gl.scm lying around.

Ah, that may be the reason.

> The new one compiles without problems. Congratulations, Joshua!

Excellent!  Just fix the file name and commit log, and we’re done!

> A tiny point I noticed: Some lines of the file start by a tab; should these
> not be replaced by spaces?

Yes.

Ludo’.

Re: [PATCH] gnu: add GL

[Ludovic Courtès]

youlysses@riseup.net skribis:

> From 08238d180a287cb3b092af0f572d63318d3b1276 Mon Sep 17 00:00:00 2001
> From: "Joshua S. Grant" <youlysses@riseup.net>
> Date: Sun, 29 Sep 2013 15:49:53 -0500
> Subject: [PATCH] Added gl.scm to packages
>
> ---
>  gnu-system.am       |   1 +
>  gnu/packages/gl.scm | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 113 insertions(+)
>  create mode 100644 gnu/packages/gl.scm

This patch is actually fine (I guess Andreas and I were looking at
copies of previous versions of gl.scm or something.)

So, sorry for the delay & bad review.

I just pushed the patch after running M-x whitespace-cleanup and adding
a proper commit log.

Thank you!

Ludo’.