diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 23 | ||||
| -rw-r--r-- | gcc10.patch | 48 |
3 files changed, 9 insertions, 74 deletions
@@ -1,20 +1,16 @@ pkgbase = mingw-w64-freeglut pkgdesc = Provides functionality for small OpenGL programs (mingw-w64) - pkgver = 3.2.1 - pkgrel = 3 + pkgver = 3.4.0 + pkgrel = 1 url = http://freeglut.sourceforge.net/ arch = any license = MIT makedepends = mingw-w64-cmake depends = mingw-w64-crt - noextract = freeglut-3.2.1.tar.gz options = !strip options = !buildflags options = staticlibs - source = https://downloads.sourceforge.net/freeglut/freeglut-3.2.1.tar.gz - source = gcc10.patch - sha256sums = d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68 - sha256sums = 2d140f9a76f16267699aeb8681da59e43345aaa1e2ff6e82032d711f72f6b66a + source = https://downloads.sourceforge.net/freeglut/freeglut-3.4.0.tar.gz + sha256sums = 3c0bcb915d9b180a97edaebd011b7a1de54583a838644dcd42bb0ea0c6f3eaec pkgname = mingw-w64-freeglut - @@ -1,6 +1,6 @@ pkgname=mingw-w64-freeglut -pkgver=3.2.1 -pkgrel=3 +pkgver=3.4.0 +pkgrel=1 pkgdesc="Provides functionality for small OpenGL programs (mingw-w64)" arch=(any) url="http://freeglut.sourceforge.net/" @@ -8,29 +8,16 @@ license=("MIT") depends=('mingw-w64-crt') makedepends=('mingw-w64-cmake') options=(!strip !buildflags staticlibs) -source=("https://downloads.sourceforge.net/freeglut/freeglut-${pkgver}.tar.gz" - 'gcc10.patch') -sha256sums=('d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68' - '2d140f9a76f16267699aeb8681da59e43345aaa1e2ff6e82032d711f72f6b66a') -noextract=("freeglut-${pkgver}.tar.gz") +source=("https://downloads.sourceforge.net/freeglut/freeglut-${pkgver}.tar.gz") +sha256sums=('3c0bcb915d9b180a97edaebd011b7a1de54583a838644dcd42bb0ea0c6f3eaec') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" -prepare() { - # Clean up old sources so re-patching doesn't fail. - [[ -d ${srcdir}/freeglut-${pkgver} ]] && rm -rf ${srcdir}/freeglut-${pkgver} - tar -xzvf ${srcdir}/freeglut-${pkgver}.tar.gz -C ${srcdir} - cd "${srcdir}/freeglut-${pkgver}" - patch -Np1 -i "${srcdir}/gcc10.patch" -} - build() { cd "${srcdir}/freeglut-${pkgver}" for _arch in ${_architectures}; do mkdir -p build-${_arch} && pushd build-${_arch} - ${_arch}-cmake \ - -DFREEGLUT_BUILD_DEMOS=OFF \ - .. + ${_arch}-cmake -DFREEGLUT_BUILD_DEMOS=OFF .. make popd done diff --git a/gcc10.patch b/gcc10.patch deleted file mode 100644 index a398e050a414..000000000000 --- a/gcc10.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Naur freeglut-3.2.1.orig/src/fg_gl2.c freeglut-3.2.1/src/fg_gl2.c ---- freeglut-3.2.1.orig/src/fg_gl2.c 2020-05-18 12:48:56.936789240 -0400 -+++ freeglut-3.2.1/src/fg_gl2.c 2020-05-18 12:49:49.278576309 -0400 -@@ -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 -Naur freeglut-3.2.1.orig/src/fg_gl2.h freeglut-3.2.1/src/fg_gl2.h ---- freeglut-3.2.1.orig/src/fg_gl2.h 2020-05-18 12:48:56.943456737 -0400 -+++ freeglut-3.2.1/src/fg_gl2.h 2020-05-18 12:51:08.235824395 -0400 -@@ -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 - |