freeglut: update to 3.6.0

package/freeglut/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		freeglut
-PKG_VERSION:=		3.2.1
+PKG_VERSION:=		3.6.0
 PKG_RELEASE:=		1
-PKG_HASH:=		d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68
+PKG_HASH:=		9c3d4d6516fbfa0280edc93c77698fb7303e443c1aaaf37d269e3288a6c3ea52
 PKG_DESCR:=		opengl utility toolkit libraries
 PKG_SECTION:=		libs/video
 PKG_DEPENDS:=		libglu
@@ -18,13 +18,14 @@ PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_ARCH_DEPENDS:=	arm mips mipsel mips64 mips64el x86 x86_64
+PKG_ARCH_DEPENDS:=	arm mips mipsel mips64 mips64el sh x86 x86_64
 
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FREEGLUT,freeglut,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIG_STYLE:=		cmake
+CMAKE_FLAGS+=		-DFREEGLUT_BUILD_DEMOS=OFF
 
 freeglut-install:
 	$(INSTALL_DIR) $(IDIR_FREEGLUT)/usr/lib

package/freeglut/patches/patch-Makefile_in

@@ -1,31 +0,0 @@
---- freeglut-2.6.0.orig/Makefile.in	2009-11-25 20:14:30.000000000 +0100
-+++ freeglut-2.6.0/Makefile.in	2012-03-12 15:05:53.767407283 +0100
-@@ -220,28 +220,6 @@ EXTRA_DIST = \
- 	freeglut_static_vs2008.vcproj \
- 	freeglut_vs2008.sln \
- 	freeglut_vs2008.vcproj \
--	progs/demos/CallbackMaker/CallbackMakerStatic.dsp \
--	progs/demos/CallbackMaker/CallbackMakerStatic_vs2008.vcproj \
--	progs/demos/CallbackMaker/CallbackMaker_vs2008.vcproj \
--	progs/demos/Fractals/FractalsStatic.dsp \
--	progs/demos/Fractals/FractalsStatic_vs2008.vcproj \
--	progs/demos/Fractals/Fractals_vs2008.vcproj \
--	progs/demos/Fractals_random/Fractals_randomStatic.dsp \
--	progs/demos/Fractals_random/Fractals_randomStatic_vs2008.vcproj \
--	progs/demos/Fractals_random/Fractals_random_vs2008.vcproj \
--	progs/demos/Lorenz/lorenzStatic.dsp \
--	progs/demos/Lorenz/lorenzStatic_vs2008.vcproj \
--	progs/demos/Lorenz/lorenz_vs2008.vcproj \
--	progs/demos/One/oneStatic.dsp \
--	progs/demos/One/oneStatic_vs2008.vcproj \
--	progs/demos/One/one_vs2008.vcproj \
--	progs/demos/demos_vs2008.sln \
--	progs/demos/shapes/shapesStatic.dsp \
--	progs/demos/shapes/shapesStatic_vs2008.vcproj \
--	progs/demos/shapes/shapes_vs2008.vcproj \
--	progs/demos/smooth_opengl3/smooth_opengl3Static.dsp \
--	progs/demos/smooth_opengl3/smooth_opengl3Static_vs2008.vcproj \
--	progs/demos/smooth_opengl3/smooth_opengl3_vs2008.vcproj
- 
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

package/freeglut/patches/patch-progs_Makefile_in

@@ -1,11 +0,0 @@
---- freeglut-2.6.0.orig/progs/Makefile.in	2009-11-25 20:14:29.000000000 +0100
-+++ freeglut-2.6.0/progs/Makefile.in	2012-03-12 15:06:38.667411355 +0100
-@@ -177,7 +177,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = demos
-+SUBDIRS =
- all: all-recursive
- 
- .SUFFIXES:

package/freeglut/patches/patch-src_fg_gl2_c

@@ -1,23 +0,0 @@
---- freeglut-3.2.1.orig/src/fg_gl2.c	2014-06-01 11:24:47.000000000 +0200
-+++ freeglut-3.2.1/src/fg_gl2.c	2021-11-02 10:29:44.673793670 +0100
-@@ -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;

package/freeglut/patches/patch-src_fg_gl2_h

@@ -1,23 +0,0 @@
---- freeglut-3.2.1.orig/src/fg_gl2.h	2012-04-21 20:22:24.000000000 +0200
-+++ freeglut-3.2.1/src/fg_gl2.h	2021-11-02 10:29:44.673793670 +0100
-@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEV
- 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
- 

package/freeglut/patches/patch-src_fg_version_h

@@ -1,16 +0,0 @@
---- freeglut-3.2.1.orig/src/fg_version.h	2014-08-18 04:00:40.000000000 +0200
-+++ freeglut-3.2.1/src/fg_version.h	2021-11-02 09:37:27.466889937 +0100
-@@ -37,11 +37,11 @@
- #endif
- 
- #ifndef VERSION_MINOR
--#define VERSION_MINOR 0
-+#define VERSION_MINOR 2
- #endif
- 
- #ifndef VERSION_PATCH
--#define VERSION_PATCH 0
-+#define VERSION_PATCH 1
- #endif
- 
- #endif