graphics-libs/freeglut: version 3.2.2

3 files changed, 6 insertions, 55 deletions

diff --git a/graphics-libs/freeglut/DETAILS b/graphics-libs/freeglut/DETAILS
index ce8e0adc5a..072c763a35 100755
--- a/graphics-libs/freeglut/DETAILS
+++ b/graphics-libs/freeglut/DETAILS
@@ -1,7 +1,7 @@
 source $GRIMOIRE/CMAKE_FUNCTIONS
            SPELL=freeglut
-         VERSION=3.2.1
-     SOURCE_HASH=sha512:aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08
+         VERSION=3.2.2
+     SOURCE_HASH=sha512:190231951d314f854c244bd27f7c20488403bd0eecffc342097a2e3d1621cec87f6c209a77b4c153aabcf44697b4070227930e295ab74fb88953cbbf94fc81d9
           SOURCE=${SPELL}-${VERSION}.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION/-rc*/}
    SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/${SOURCE}
diff --git a/graphics-libs/freeglut/HISTORY b/graphics-libs/freeglut/HISTORY
index ffea67741a..1a8202e64c 100644
--- a/graphics-libs/freeglut/HISTORY
+++ b/graphics-libs/freeglut/HISTORY
@@ -1,3 +1,7 @@
+2022-03-12  Florian Franzmann  <bwlf@bandrate.org>
+	* DETAILS: version 3.2.2
+	* freeglut-3.2.1-gcc10_fix-1.patch: removed
+
 2020-09-26 Thomas Orgis <sobukus@sourcemage.org>
 	* PRE_BUILD, patches/freeglut-3.2.1-gcc10_fix-1.patch:
 	  add patch for gcc 10 via LFS
diff --git a/graphics-libs/freeglut/patches/freeglut-3.2.1-gcc10_fix-1.patch b/graphics-libs/freeglut/patches/freeglut-3.2.1-gcc10_fix-1.patch
deleted file mode 100644
index 85fe4d7a99..0000000000
--- a/graphics-libs/freeglut/patches/freeglut-3.2.1-gcc10_fix-1.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Submitted By:            Pierre Labastie <pierre dot labastie at neuf dot fr>
-Date:                    2020-05-19
-Initial Package Version: 3.2.1
-Upstream Status:         Committed
-Origin:                  Upstream https://sourceforge.net/p/freeglut/code/1863/
-Description:             Fixes "multiple defition" issues
-
---- a/src/fg_gl2.c
-+++ b/src/fg_gl2.c
-@@ -26,6 +26,20 @@
- #include <GL/freeglut.h>
- #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)
---- a/src/fg_gl2.h
-+++ b/src/fg_gl2.h
-@@ -67,13 +67,13 @@
- 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
-