diff --git a/freeglut-3.0.0.tar.gz b/freeglut-3.0.0.tar.gz deleted file mode 100644 index 23edf2236841783aa55d15a319a127575a9b8af9..0000000000000000000000000000000000000000 Binary files a/freeglut-3.0.0.tar.gz and /dev/null differ diff --git a/freeglut-3.4.0.tar.gz b/freeglut-3.4.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..3721c128668f83fe8ecc1a20529bcfd74418cafd Binary files /dev/null and b/freeglut-3.4.0.tar.gz differ diff --git a/freeglut.spec b/freeglut.spec index 29b64d88c8cf54d7d1cd919e6a8db8cbd0457c8d..9151b441012b18168712b8a07610c26f51b57ced 100644 --- a/freeglut.spec +++ b/freeglut.spec @@ -1,12 +1,11 @@ Name: freeglut -Version: 3.0.0 -Release: 11 +Version: 3.4.0 +Release: 1 Summary: A freely licensed alternative to the GLUT library License: MIT URL: http://freeglut.sourceforge.net Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: https://downloads.sourceforge.net/openglut/openglut-0.6.3-doc.tar.gz -Patch0: gcc-10.patch BuildRequires: gcc gcc-c++ cmake libXi-devel libICE-devel BuildRequires: pkgconfig libGLU-devel libXext-devel libXxf86vm-devel @@ -60,13 +59,17 @@ install -p -m 644 doc/man/*.3 $RPM_BUILD_ROOT/%{_mandir}/man3 %files devel %{_includedir}/GL/*.h %{_libdir}/libglut.so -%{_libdir}/pkgconfig/freeglut.pc +%{_libdir}/pkgconfig/glut.pc +%{_libdir}/cmake/FreeGLUT/* %files help %{_mandir}/man3/* -%doc README doc/*.png doc/*.html +%doc README.md doc/html/*.png doc/html/*.html %changelog +* Tue Oct 17 2023 wangkai <13474090681@163.com> - 3.4.0-1 +- Update to 3.4.0 + * Fri Jul 30 2021 linjiaxin5 - 3.0.0-11 - Fix failure caused by GCC upgrade to 10 diff --git a/freeglut.yaml b/freeglut.yaml index 6587738fdd8890c895403b81a60fd852b583352a..82f34b0793c69b9466558804300ba85219e0cebc 100644 --- a/freeglut.yaml +++ b/freeglut.yaml @@ -1,4 +1,4 @@ version_control: github -src_repo: dcnieho/FreeGLUT -tag_prefix: ^FG_ -seperator: _ +src_repo: FreeGLUTProject/freeglut +tag_prefix: ^v +separator: . diff --git a/gcc-10.patch b/gcc-10.patch deleted file mode 100644 index 35a50382723688e1ed93a28820595c1c9e97308b..0000000000000000000000000000000000000000 --- a/gcc-10.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/src/fg_gl2.c -+++ b/src/fg_gl2.c -@@ -26,6 +26,20 @@ - #include - #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