Update to 3.4.0
This commit is contained in:
parent
68802e6a16
commit
8d8efd5802
Binary file not shown.
BIN
freeglut-3.4.0.tar.gz
Normal file
BIN
freeglut-3.4.0.tar.gz
Normal file
Binary file not shown.
@ -1,12 +1,11 @@
|
|||||||
Name: freeglut
|
Name: freeglut
|
||||||
Version: 3.0.0
|
Version: 3.4.0
|
||||||
Release: 11
|
Release: 1
|
||||||
Summary: A freely licensed alternative to the GLUT library
|
Summary: A freely licensed alternative to the GLUT library
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: http://freeglut.sourceforge.net
|
URL: http://freeglut.sourceforge.net
|
||||||
Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||||
Source1: https://downloads.sourceforge.net/openglut/openglut-0.6.3-doc.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: gcc gcc-c++ cmake libXi-devel libICE-devel
|
||||||
BuildRequires: pkgconfig libGLU-devel libXext-devel libXxf86vm-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
|
%files devel
|
||||||
%{_includedir}/GL/*.h
|
%{_includedir}/GL/*.h
|
||||||
%{_libdir}/libglut.so
|
%{_libdir}/libglut.so
|
||||||
%{_libdir}/pkgconfig/freeglut.pc
|
%{_libdir}/pkgconfig/glut.pc
|
||||||
|
%{_libdir}/cmake/FreeGLUT/*
|
||||||
|
|
||||||
%files help
|
%files help
|
||||||
%{_mandir}/man3/*
|
%{_mandir}/man3/*
|
||||||
%doc README doc/*.png doc/*.html
|
%doc README.md doc/html/*.png doc/html/*.html
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 17 2023 wangkai <13474090681@163.com> - 3.4.0-1
|
||||||
|
- Update to 3.4.0
|
||||||
|
|
||||||
* Fri Jul 30 2021 linjiaxin5 <linjiaxin5@huawei.com> - 3.0.0-11
|
* Fri Jul 30 2021 linjiaxin5 <linjiaxin5@huawei.com> - 3.0.0-11
|
||||||
- Fix failure caused by GCC upgrade to 10
|
- Fix failure caused by GCC upgrade to 10
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
version_control: github
|
version_control: github
|
||||||
src_repo: dcnieho/FreeGLUT
|
src_repo: FreeGLUTProject/freeglut
|
||||||
tag_prefix: ^FG_
|
tag_prefix: ^v
|
||||||
seperator: _
|
separator: .
|
||||||
|
|||||||
45
gcc-10.patch
45
gcc-10.patch
@ -1,45 +0,0 @@
|
|||||||
--- 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
|
|
||||||
Loading…
x
Reference in New Issue
Block a user