freeglut-2.8.0

svn path=/nixpkgs/trunk/; revision=31304

2 files changed, 49 insertions, 6 deletions

diff --git a/pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch b/pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch
new file mode 100644
index 00000000000..b11a50a9de1
--- /dev/null
+++ b/pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch
@@ -0,0 +1,43 @@
+From 9df489c765921d8d3ff96a13c01592d9209431bb Mon Sep 17 00:00:00 2001
+From: Florian Friesdorf <flo@chaoflow.net>
+Date: Wed, 4 Jan 2012 23:12:44 +0100
+Subject: [PATCH] remove typedefs now living in mesa
+
+---
+ progs/demos/smooth_opengl3/smooth_opengl3.c |   20 --------------------
+ 1 files changed, 0 insertions(+), 20 deletions(-)
+
+diff --git a/progs/demos/smooth_opengl3/smooth_opengl3.c b/progs/demos/smooth_opengl3/smooth_opengl3.c
+index abbdfb5..1172615 100755
+--- a/progs/demos/smooth_opengl3/smooth_opengl3.c
++++ b/progs/demos/smooth_opengl3/smooth_opengl3.c
+@@ -98,26 +98,6 @@ typedef char ourGLchar;
+ #define APIENTRY
+ #endif
+ 
+-typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
+-typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+-typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage);
+-typedef GLuint (APIENTRY *PFNGLCREATESHADERPROC) (GLenum type);
+-typedef void (APIENTRY *PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const ourGLchar **string, const GLint *length);
+-typedef void (APIENTRY *PFNGLCOMPILESHADERPROC) (GLuint shader);
+-typedef GLuint (APIENTRY *PFNGLCREATEPROGRAMPROC) (void);
+-typedef void (APIENTRY *PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
+-typedef void (APIENTRY *PFNGLLINKPROGRAMPROC) (GLuint program);
+-typedef void (APIENTRY *PFNGLUSEPROGRAMPROC) (GLuint program);
+-typedef void (APIENTRY *PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
+-typedef void (APIENTRY *PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog);
+-typedef void (APIENTRY *PFNGLGETPROGRAMIVPROC) (GLenum target, GLenum pname, GLint *params);
+-typedef void (APIENTRY *PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog);
+-typedef GLint (APIENTRY *PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const ourGLchar *name);
+-typedef void (APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+-typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+-typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name);
+-typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+-
+ PFNGLGENBUFFERSPROC gl_GenBuffers;
+ PFNGLBINDBUFFERPROC gl_BindBuffer;
+ PFNGLBUFFERDATAPROC gl_BufferData;
+-- 
+1.7.8
+
diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix
index a225ca748a2..9d599560fc8 100644
--- a/pkgs/development/libraries/freeglut/default.nix
+++ b/pkgs/development/libraries/freeglut/default.nix
@@ -1,15 +1,15 @@
-{stdenv, fetchurl, x11, mesa}:
+{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, x11 }:
 
 stdenv.mkDerivation {
-  name = "freeglut-2.4.0";
+  name = "freeglut-2.8.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/freeglut/freeglut-2.4.0.tar.gz;
-    sha256 = "0lmhh5p19rw4wisr0jsl7nsa2hxdaasj0vxk5ri83crhp982v7r6";
+    url = mirror://sourceforge/freeglut/freeglut-2.8.0.tar.gz;
+    sha256 = "197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05";
   };
 
   configureFlags = "--" + (if stdenv.isDarwin then "disable" else "enable") + "-warnings";
 
-  buildInputs = [x11 mesa];
-  patches = ./freeglut-gcc-4.2.patch;
+  buildInputs = [ libXi libXrandr libXxf86vm mesa x11 ];
+  patches = [ ./0001-remove-typedefs-now-living-in-mesa.patch ];
 }