summary refs log tree commit diff
path: root/pkgs/development/libraries/freeglut
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2015-08-17 19:12:30 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2015-08-18 18:45:13 +0200
commit4a75883932298b2c54888ec830bf76ab46a83f5a (patch)
tree5361bb74faa048c7da3dd0fe264ba7bfa8c65114 /pkgs/development/libraries/freeglut
parenta732b1413faf62d3137f10807d670a2c3becb771 (diff)
downloadnixpkgs-4a75883932298b2c54888ec830bf76ab46a83f5a.tar
nixpkgs-4a75883932298b2c54888ec830bf76ab46a83f5a.tar.gz
nixpkgs-4a75883932298b2c54888ec830bf76ab46a83f5a.tar.bz2
nixpkgs-4a75883932298b2c54888ec830bf76ab46a83f5a.tar.lz
nixpkgs-4a75883932298b2c54888ec830bf76ab46a83f5a.tar.xz
nixpkgs-4a75883932298b2c54888ec830bf76ab46a83f5a.tar.zst
nixpkgs-4a75883932298b2c54888ec830bf76ab46a83f5a.zip
freeglut: remove unused patch
Diffstat (limited to 'pkgs/development/libraries/freeglut')
-rw-r--r--pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch43
-rw-r--r--pkgs/development/libraries/freeglut/default.nix2
2 files changed, 0 insertions, 45 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
deleted file mode 100644
index b11a50a9de1..00000000000
--- a/pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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 73e7e2ccce5..20bd2b6da4d 100644
--- a/pkgs/development/libraries/freeglut/default.nix
+++ b/pkgs/development/libraries/freeglut/default.nix
@@ -22,6 +22,4 @@ in stdenv.mkDerivation {
   '';
 
   configureFlags = [ "--enable-warnings" ];
-
-  # patches = [ ./0001-remove-typedefs-now-living-in-mesa.patch ];
 }