update to freeglut-3.2.2
This commit is contained in:
parent
cd9226d81f
commit
dccbf0d9ed
|
@ -1,6 +1,6 @@
|
|||
COMMENT = open source alternative to glut
|
||||
|
||||
DISTNAME = freeglut-3.2.1
|
||||
DISTNAME = freeglut-3.2.2
|
||||
|
||||
SHARED_LIBS += glut 7.0
|
||||
|
||||
|
@ -11,7 +11,7 @@ HOMEPAGE = http://freeglut.sourceforge.net/
|
|||
# X11
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
WANTLIB += GL ICE SM X11 Xext Xi Xrandr Xxf86vm m
|
||||
WANTLIB += GL X11 Xi Xrandr Xxf86vm m
|
||||
|
||||
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=freeglut/}
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (freeglut-3.2.1.tar.gz) = 1AAOAhAqyvJZmYyHDiUhRznR8W9n+ZyzXk9GhBOZ2mg=
|
||||
SIZE (freeglut-3.2.1.tar.gz) = 440228
|
||||
SHA256 (freeglut-3.2.2.tar.gz) = xZRKCC3wu6lrV1bd2x910M1yzie1OVxsHd6Fwv8pelA=
|
||||
SIZE (freeglut-3.2.2.tar.gz) = 397203
|
||||
|
|
|
@ -1,27 +0,0 @@
|
|||
fix for -fno-common
|
||||
https://sourceforge.net/p/freeglut/code/1863/
|
||||
|
||||
Index: src/fg_gl2.c
|
||||
--- src/fg_gl2.c.orig
|
||||
+++ src/fg_gl2.c
|
||||
@@ -27,6 +27,20 @@
|
||||
#include "fg_internal.h"
|
||||
#include "fg_gl2.h"
|
||||
|
||||
+#ifndef GL_ES_VERSION_2_0
|
||||
+/* GLES2 has the corresponding entry points built-in, and these fgh-prefixed
|
||||
+ * names are defined in fg_gl2.h header to reference them, for any other case,
|
||||
+ * define them as function pointers here.
|
||||
+ */
|
||||
+FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
|
||||
+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
|
||||
+FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
|
||||
+FGH_PFNGLBUFFERDATAPROC fghBufferData;
|
||||
+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
|
||||
+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
|
||||
+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
|
||||
+#endif
|
||||
+
|
||||
void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
|
||||
if (fgStructure.CurrentWindow != NULL)
|
||||
fgStructure.CurrentWindow->Window.attribute_v_coord = attrib;
|
|
@ -1,27 +0,0 @@
|
|||
fix for -fno-common
|
||||
https://sourceforge.net/p/freeglut/code/1863/
|
||||
|
||||
Index: src/fg_gl2.h
|
||||
--- src/fg_gl2.h.orig
|
||||
+++ src/fg_gl2.h
|
||||
@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARR
|
||||
typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
|
||||
typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
|
||||
|
||||
-FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
|
||||
-FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
|
||||
-FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
|
||||
-FGH_PFNGLBUFFERDATAPROC fghBufferData;
|
||||
-FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
|
||||
-FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
|
||||
-FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
|
||||
+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
|
||||
+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
|
||||
+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
|
||||
+extern FGH_PFNGLBUFFERDATAPROC fghBufferData;
|
||||
+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
|
||||
+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
|
||||
+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
|
||||
|
||||
# endif
|
||||
|
Loading…
Reference in New Issue