pyrox.dev
freeglut-2.8.0
svn path=/nixpkgs/trunk/; revision=31304
+43
pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch
+43
pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch
···
1
+
From 9df489c765921d8d3ff96a13c01592d9209431bb Mon Sep 17 00:00:00 2001
2
+
From: Florian Friesdorf <flo@chaoflow.net>
3
+
Date: Wed, 4 Jan 2012 23:12:44 +0100
4
+
Subject: [PATCH] remove typedefs now living in mesa
5
+
6
+
---
7
+
progs/demos/smooth_opengl3/smooth_opengl3.c | 20 --------------------
8
+
1 files changed, 0 insertions(+), 20 deletions(-)
9
+
10
+
diff --git a/progs/demos/smooth_opengl3/smooth_opengl3.c b/progs/demos/smooth_opengl3/smooth_opengl3.c
11
+
index abbdfb5..1172615 100755
12
+
--- a/progs/demos/smooth_opengl3/smooth_opengl3.c
13
+
+++ b/progs/demos/smooth_opengl3/smooth_opengl3.c
14
+
@@ -98,26 +98,6 @@ typedef char ourGLchar;
15
+
#define APIENTRY
16
+
#endif
17
+
18
+
-typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
19
+
-typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
20
+
-typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage);
21
+
-typedef GLuint (APIENTRY *PFNGLCREATESHADERPROC) (GLenum type);
22
+
-typedef void (APIENTRY *PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const ourGLchar **string, const GLint *length);
23
+
-typedef void (APIENTRY *PFNGLCOMPILESHADERPROC) (GLuint shader);
24
+
-typedef GLuint (APIENTRY *PFNGLCREATEPROGRAMPROC) (void);
25
+
-typedef void (APIENTRY *PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
26
+
-typedef void (APIENTRY *PFNGLLINKPROGRAMPROC) (GLuint program);
27
+
-typedef void (APIENTRY *PFNGLUSEPROGRAMPROC) (GLuint program);
28
+
-typedef void (APIENTRY *PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
29
+
-typedef void (APIENTRY *PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog);
30
+
-typedef void (APIENTRY *PFNGLGETPROGRAMIVPROC) (GLenum target, GLenum pname, GLint *params);
31
+
-typedef void (APIENTRY *PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog);
32
+
-typedef GLint (APIENTRY *PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const ourGLchar *name);
33
+
-typedef void (APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
34
+
-typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
35
+
-typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name);
36
+
-typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
37
+
-
38
+
PFNGLGENBUFFERSPROC gl_GenBuffers;
39
+
PFNGLBINDBUFFERPROC gl_BindBuffer;
40
+
PFNGLBUFFERDATAPROC gl_BufferData;
41
+
--
42
+
1.7.8
43
+
+6
-6
pkgs/development/libraries/freeglut/default.nix
+6
-6
pkgs/development/libraries/freeglut/default.nix
···
1
-
{stdenv, fetchurl, x11, mesa}:
1
+
{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, x11 }:
2
2
3
3
stdenv.mkDerivation {
4
-
name = "freeglut-2.4.0";
4
+
name = "freeglut-2.8.0";
5
5
6
6
src = fetchurl {
7
-
url = mirror://sourceforge/freeglut/freeglut-2.4.0.tar.gz;
8
-
sha256 = "0lmhh5p19rw4wisr0jsl7nsa2hxdaasj0vxk5ri83crhp982v7r6";
7
+
url = mirror://sourceforge/freeglut/freeglut-2.8.0.tar.gz;
8
+
sha256 = "197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05";
9
9
};
10
10
11
11
configureFlags = "--" + (if stdenv.isDarwin then "disable" else "enable") + "-warnings";
12
12
13
-
buildInputs = [x11 mesa];
14
-
patches = ./freeglut-gcc-4.2.patch;
13
+
buildInputs = [ libXi libXrandr libXxf86vm mesa x11 ];
14
+
patches = [ ./0001-remove-typedefs-now-living-in-mesa.patch ];
15
15
}