# HG changeset patch # User John Donoghue # Date 1653675876 14400 # Node ID dfdc997c1e4c340ea9fab8c0b3a65d9c2d141285 # Parent fb7597bb493cba0943dffed03ce2e64bce7fce98 freeglute: update to v3.2.2 * src/freeglut-1-fixes.patch: delete * dist-files.mk: remove ref to deleted file * src/freeglut.mk: update version, checksum, use github for update diff -r fb7597bb493c -r dfdc997c1e4c dist-files.mk --- a/dist-files.mk Fri May 27 14:24:35 2022 -0400 +++ b/dist-files.mk Fri May 27 14:24:36 2022 -0400 @@ -101,7 +101,6 @@ fltk-test.cpp \ fltk.mk \ fontconfig.mk \ - freeglut-1-fixes.patch \ freeglut-test.c \ freeglut.mk \ freeimage-1-fixes.patch \ diff -r fb7597bb493c -r dfdc997c1e4c src/freeglut-1-fixes.patch --- a/src/freeglut-1-fixes.patch Fri May 27 14:24:35 2022 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -diff --git a/freeglut/freeglut/src/fg_gl2.c b/freeglut/freeglut/src/fg_gl2.c -index 38b0acbb..f79c432a 100644 ---- a/src/fg_gl2.c -+++ b/src/fg_gl2.c -@@ -27,6 +27,18 @@ - #include "fg_internal.h" - #include "fg_gl2.h" - -+#ifdef GL_ES_VERSION_2_0 -+/* Use existing functions on GLES 2.0 */ -+#else -+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/freeglut/freeglut/src/fg_gl2.h b/freeglut/freeglut/src/fg_gl2.h -index ab8ba5c7..fb3d4676 100644 ---- a/src/fg_gl2.h -+++ b/src/fg_gl2.h -@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); - 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 -r fb7597bb493c -r dfdc997c1e4c src/freeglut.mk --- a/src/freeglut.mk Fri May 27 14:24:35 2022 -0400 +++ b/src/freeglut.mk Fri May 27 14:24:36 2022 -0400 @@ -3,8 +3,8 @@ PKG := freeglut $(PKG)_IGNORE := -$(PKG)_VERSION := 3.2.1 -$(PKG)_CHECKSUM := 7a62e0d2caad92ff745bc5037592b2753f0b2f20 +$(PKG)_VERSION := 3.2.2 +$(PKG)_CHECKSUM := 8e53cc0251165d02cce8d6d5054159c310958b74 $(PKG)_SUBDIR := freeglut-$(word 1,$(subst -, ,$($(PKG)_VERSION))) $(PKG)_FILE := freeglut-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/freeglut/freeglut/$($(PKG)_VERSION)/$($(PKG)_FILE) @@ -16,8 +16,8 @@ $(PKG)_CMAKE_FLAGS := define $(PKG)_UPDATE - $(WGET) -q -O- 'http://sourceforge.net/projects/freeglut/files/freeglut/' | \ - $(SED) -n 's,.*freeglut-\([0-9][^>]*\)\.tar.*,\1,p' | \ + $(WGET) -q -O- 'https://github.com/FreeGLUTProject/freeglut/tags' | \ + $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | \ head -1 endef