From faa3ca5279e9b038f879f8c1307673931646f0b5a3838a4c9c26df4978f71ca3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 24 Mar 2022 08:35:01 +0000 Subject: [PATCH] Accepting request 964489 from home:dirkmueller:Factory - update to 3.2.2: * Fix netbsd/aarch64 build by including sys/joystick.h instead of machine/joystick.h. * Fix build with gcc >= 10 which made -fno-common the default by no longer relying on COMMON symbols for globals. * Fix android build (default to FREEGLUT_GLES, and check for debug flags). * Add flat shading option to the shapes demo. * Fix crash when calling primitive drawing functions without creating a window first. * Dropped really old and unmaintained doc directory from the source tree. - drop gcc10.patch (obsolete) OBS-URL: https://build.opensuse.org/request/show/964489 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/freeglut?expand=0&rev=30 --- freeglut-3.2.1.tar.gz | 3 -- freeglut-3.2.2.tar.gz | 3 ++ freeglut.changes | 12 ++++++++ freeglut.spec | 6 ++-- gcc10.patch | 66 ------------------------------------------- 5 files changed, 17 insertions(+), 73 deletions(-) delete mode 100644 freeglut-3.2.1.tar.gz create mode 100644 freeglut-3.2.2.tar.gz delete mode 100644 gcc10.patch diff --git a/freeglut-3.2.1.tar.gz b/freeglut-3.2.1.tar.gz deleted file mode 100644 index 145b76c..0000000 --- a/freeglut-3.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68 -size 440228 diff --git a/freeglut-3.2.2.tar.gz b/freeglut-3.2.2.tar.gz new file mode 100644 index 0000000..f902e04 --- /dev/null +++ b/freeglut-3.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5944a082df0bba96b5756dddb1f75d0cd72ce27b5395c6c1dde85c2ff297a50 +size 397203 diff --git a/freeglut.changes b/freeglut.changes index 20107f5..c359275 100644 --- a/freeglut.changes +++ b/freeglut.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Mar 24 07:18:19 UTC 2022 - Dirk Müller + +- update to 3.2.2: + * Fix netbsd/aarch64 build by including sys/joystick.h instead of machine/joystick.h. + * Fix build with gcc >= 10 which made -fno-common the default by no longer relying on COMMON symbols for globals. + * Fix android build (default to FREEGLUT_GLES, and check for debug flags). + * Add flat shading option to the shapes demo. + * Fix crash when calling primitive drawing functions without creating a window first. + * Dropped really old and unmaintained doc directory from the source tree. +- drop gcc10.patch (obsolete) + ------------------------------------------------------------------- Thu Mar 12 09:39:20 UTC 2020 - Tomáš Chvátal diff --git a/freeglut.spec b/freeglut.spec index 62ef8f7..03c421e 100644 --- a/freeglut.spec +++ b/freeglut.spec @@ -1,7 +1,7 @@ # # spec file for package freeglut # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define _libname libglut3 Name: freeglut -Version: 3.2.1 +Version: 3.2.2 Release: 0 Summary: Freely licensed alternative to the GLUT library License: MIT @@ -26,7 +26,6 @@ URL: http://freeglut.sourceforge.net/ Source: https://downloads.sourceforge.net/project/freeglut/%{name}/%{version}/%{name}-%{version}.tar.gz Source1: https://downloads.sourceforge.net/openglut/openglut-0.6.3-doc.tar.gz Source2: baselibs.conf -Patch0: gcc10.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -108,7 +107,6 @@ joystick functions on a wide range of platforms. %prep %setup -q -a1 -%patch0 -p3 %build %cmake \ diff --git a/gcc10.patch b/gcc10.patch deleted file mode 100644 index 72fcb83..0000000 --- a/gcc10.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b9998bbc1e1c329f6bf69c24606a2be7a4973b8c Mon Sep 17 00:00:00 2001 -From: jtsiomb -Date: Fri, 21 Feb 2020 22:25:31 +0000 -Subject: [PATCH] Work-around for an issue which cropped up with the release of - gcc-10. In their infinite wisdom, they decided to build with -fno-common as - default from now on, breaking every piece of C code which used to declare - common symbols in header files, as was the convention since the dawn of time. - We now have to duplicate all declarations to an arbitrary source file, and - change the header-file ones to prefix them with extern. - -git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1863 7f0cb862-5218-0410-a997-914c9d46530a ---- - freeglut/freeglut/src/fg_gl2.c | 14 ++++++++++++++ - freeglut/freeglut/src/fg_gl2.h | 14 +++++++------- - 2 files changed, 21 insertions(+), 7 deletions(-) - -diff --git a/freeglut/freeglut/src/fg_gl2.c b/freeglut/freeglut/src/fg_gl2.c -index 38b0acbb..54b4285b 100644 ---- a/freeglut/freeglut/src/fg_gl2.c -+++ b/freeglut/freeglut/src/fg_gl2.c -@@ -27,6 +27,20 @@ - #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) - 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/freeglut/freeglut/src/fg_gl2.h -+++ b/freeglut/freeglut/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 -