freeglut: update to 3.2.1, add buildroot patch to compile with gcc 10.x

4 files changed, 64 insertions, 2 deletions

diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile
index cee02625d..1ed30db0d 100644
--- a/package/freeglut/Makefile
+++ b/package/freeglut/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		freeglut
-PKG_VERSION:=		3.0.0
+PKG_VERSION:=		3.2.1
 PKG_RELEASE:=		1
-PKG_HASH:=		2a43be8515b01ea82bcfa17d29ae0d40bd128342f0930cd1f375f1ff999f76a2
+PKG_HASH:=		d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68
 PKG_DESCR:=		opengl utility toolkit libraries
 PKG_SECTION:=		libs/video
 PKG_DEPENDS:=		libglu
diff --git a/package/freeglut/patches/patch-src_fg_gl2_c b/package/freeglut/patches/patch-src_fg_gl2_c
new file mode 100644
index 000000000..dbd947a91
--- /dev/null
+++ b/package/freeglut/patches/patch-src_fg_gl2_c
@@ -0,0 +1,23 @@
+--- freeglut-3.2.1.orig/src/fg_gl2.c	2014-06-01 11:24:47.000000000 +0200
++++ freeglut-3.2.1/src/fg_gl2.c	2021-11-02 10:29:44.673793670 +0100
+@@ -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;
diff --git a/package/freeglut/patches/patch-src_fg_gl2_h b/package/freeglut/patches/patch-src_fg_gl2_h
new file mode 100644
index 000000000..a552d4fa9
--- /dev/null
+++ b/package/freeglut/patches/patch-src_fg_gl2_h
@@ -0,0 +1,23 @@
+--- freeglut-3.2.1.orig/src/fg_gl2.h	2012-04-21 20:22:24.000000000 +0200
++++ freeglut-3.2.1/src/fg_gl2.h	2021-11-02 10:29:44.673793670 +0100
+@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEV
+ 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
+ 
diff --git a/package/freeglut/patches/patch-src_fg_version_h b/package/freeglut/patches/patch-src_fg_version_h
new file mode 100644
index 000000000..6bb5f6d69
--- /dev/null
+++ b/package/freeglut/patches/patch-src_fg_version_h
@@ -0,0 +1,16 @@
+--- freeglut-3.2.1.orig/src/fg_version.h	2014-08-18 04:00:40.000000000 +0200
++++ freeglut-3.2.1/src/fg_version.h	2021-11-02 09:37:27.466889937 +0100
+@@ -37,11 +37,11 @@
+ #endif
+ 
+ #ifndef VERSION_MINOR
+-#define VERSION_MINOR 0
++#define VERSION_MINOR 2
+ #endif
+ 
+ #ifndef VERSION_PATCH
+-#define VERSION_PATCH 0
++#define VERSION_PATCH 1
+ #endif
+ 
+ #endif