1
0
forked from ports/opt

freeglut: 3.2.1 -> 3.2.2

This commit is contained in:
Tim Biermann 2022-02-17 15:19:02 +01:00
parent 590d6718d9
commit c47dba9c91
Signed by untrusted user: tb
GPG Key ID: 42F8B4E30B673606
4 changed files with 9 additions and 61 deletions

View File

@ -15,8 +15,8 @@ drwxr-xr-x root/root usr/lib/cmake/FreeGLUT/
-rw-r--r-- root/root usr/lib/cmake/FreeGLUT/FreeGLUTTargets.cmake
-rw-r--r-- root/root usr/lib/libglut.a
lrwxrwxrwx root/root usr/lib/libglut.so -> libglut.so.3
lrwxrwxrwx root/root usr/lib/libglut.so.3 -> libglut.so.3.11.0
-rwxr-xr-x root/root usr/lib/libglut.so.3.11.0
lrwxrwxrwx root/root usr/lib/libglut.so.3 -> libglut.so.3.11.1
-rwxr-xr-x root/root usr/lib/libglut.so.3.11.1
drwxr-xr-x root/root usr/lib/pkgconfig/
lrwxrwxrwx root/root usr/lib/pkgconfig/freeglut.pc -> glut.pc
-rw-r--r-- root/root usr/lib/pkgconfig/glut.pc

View File

@ -1,6 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/Z7tNl58Vtx8gTGYcj0/BNPS6O5DoZEDdeQuBQauujrMqKEcv8pw7K+liM0ekVHC/6vGhltH00VBprzTMjqZiQU=
SHA256 (Pkgfile) = 9acfdef672f13ec4b1d64f62145a766be2d78d617ba8751b1bc18fef8c55d147
SHA256 (.footprint) = e1456ea754b868b14d770c08b877d10d842f5ea84e5170911f187ecdf7d7eedc
SHA256 (freeglut-3.2.1.tar.gz) = d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68
SHA256 (gcc10.patch) = ce2d11ffbffda1872dde5d50198fa5de961c22716e29fb1715648b7b818222c5
RWSE3ohX2g5d/RGx1Btd6MZvD1iG0KGqrtUjvt/QzhlJIyi9IjhWwxYZEZehJNZUvRgpm1XA9vm1dH5bdLlDUKpxDsm9ZZ+3MAo=
SHA256 (Pkgfile) = 7fa9e6fbe476b4b89eec143aabb6f9aacae84b08386620e18ffc30c40c3e3b27
SHA256 (.footprint) = b27e5d8b2b7eba20ad172f9d28b84fe42f5d83fdf370c275d61299c14faf56a0
SHA256 (freeglut-3.2.2.tar.gz) = c5944a082df0bba96b5756dddb1f75d0cd72ce27b5395c6c1dde85c2ff297a50

View File

@ -4,14 +4,11 @@
# Depends on: glu xorg-libxi
name=freeglut
version=3.2.1
release=2
source=(https://downloads.sourceforge.net/$name/$name-$version.tar.gz
gcc10.patch)
version=3.2.2
release=1
source=(https://downloads.sourceforge.net/$name/$name-$version.tar.gz)
build() {
patch -d $name-$version -p1 -i $SRC/gcc10.patch
cmake -S$name-$version -Bbuild -GNinja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \

View File

@ -1,48 +0,0 @@
diff -urN 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 2014-06-01 04:24:47.000000000 -0500
+++ freeglut-3.2.1/src/fg_gl2.c 2020-08-04 19:54:14.348875031 -0500
@@ -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 -urN 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 2012-04-21 13:22:24.000000000 -0500
+++ freeglut-3.2.1/src/fg_gl2.h 2020-08-04 19:54:17.075914225 -0500
@@ -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