patches/freeglut/freeglut-3.2.1-gcc10_fix-1.patch

   1 Submitted By:            Pierre Labastie <pierre dot labastie at neuf dot fr>
   2 Date:                    2020-05-19
   3 Initial Package Version: 3.2.1
   4 Upstream Status:         Committed
   5 Origin:                  Upstream https://sourceforge.net/p/freeglut/code/1863/
   6 Description:             Fixes "multiple defition" issues
   7
   8 --- a/src/fg_gl2.c
   9 +++ b/src/fg_gl2.c
  10 @@ -26,6 +26,20 @@
  11  #include <GL/freeglut.h>
  12  #include "fg_internal.h"
  13  #include "fg_gl2.h"
  14 +
  15 +#ifndef GL_ES_VERSION_2_0
  16 +/* GLES2 has the corresponding entry points built-in, and these fgh-prefixed
  17 + * names are defined in fg_gl2.h header to reference them, for any other case,
  18 + * define them as function pointers here.
  19 + */
  20 +FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
  21 +FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
  22 +FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
  23 +FGH_PFNGLBUFFERDATAPROC fghBufferData;
  24 +FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
  25 +FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
  26 +FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
  27 +#endif
  28
  29  void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
  30    if (fgStructure.CurrentWindow != NULL)
  31 --- a/src/fg_gl2.h
  32 +++ b/src/fg_gl2.h
  33 @@ -67,13 +67,13 @@
  34  typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
  35  typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
  36
  37 -FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
  38 -FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
  39 -FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
  40 -FGH_PFNGLBUFFERDATAPROC fghBufferData;
  41 -FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
  42 -FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
  43 -FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
  44 +extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
  45 +extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
  46 +extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
  47 +extern FGH_PFNGLBUFFERDATAPROC fghBufferData;
  48 +extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
  49 +extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
  50 +extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
  51
  52  #    endif
  53