commit 127ccb0616ee56b851e596532da2cd358b5ba9a4 Author: Tim Biermann <tbier@posteo.de> Date: Wed Feb 16 22:52:51 2022 +0100 freeglut-32: 3.2.1 -> 3.2.2 diff --git a/freeglut-32/.footprint b/freeglut-32/.footprint index b360092..ce821e4 100644 --- a/freeglut-32/.footprint +++ b/freeglut-32/.footprint @@ -8,8 +8,8 @@ drwxr-xr-x root/root usr/lib32/cmake/FreeGLUT/ -rw-r--r-- root/root usr/lib32/cmake/FreeGLUT/FreeGLUTTargets.cmake -rw-r--r-- root/root usr/lib32/libglut.a lrwxrwxrwx root/root usr/lib32/libglut.so -> libglut.so.3 -lrwxrwxrwx root/root usr/lib32/libglut.so.3 -> libglut.so.3.11.0 --rwxr-xr-x root/root usr/lib32/libglut.so.3.11.0 +lrwxrwxrwx root/root usr/lib32/libglut.so.3 -> libglut.so.3.11.1 +-rwxr-xr-x root/root usr/lib32/libglut.so.3.11.1 drwxr-xr-x root/root usr/lib32/pkgconfig/ lrwxrwxrwx root/root usr/lib32/pkgconfig/freeglut.pc -> glut.pc -rw-r--r-- root/root usr/lib32/pkgconfig/glut.pc diff --git a/freeglut-32/.signature b/freeglut-32/.signature index 3cd67b0..aac2653 100644 --- a/freeglut-32/.signature +++ b/freeglut-32/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXVUV6+p9/CVUCzzOMm048Xv0aOHCWW/WgVxNkGfsWMik4ztn3o/cvC9WNYsBfG42zcr5028wyhnysx6fG4ZczAQ= -SHA256 (Pkgfile) = 371b51eeb249ddbd0afe435dc29e7f7c1b29a6b051395624251140d5869ce832 -SHA256 (.footprint) = 86a5d0ab594286e1a5375ce12648f711c52f1a4d9807a02c8b4936e1563a4e8b -SHA256 (freeglut-3.2.1.tar.gz) = d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68 -SHA256 (gcc10.patch) = ce2d11ffbffda1872dde5d50198fa5de961c22716e29fb1715648b7b818222c5 +RWSwxGo/zH7eXaVDn8qkWcFH+yelZClXTQiXAKFBDv8KfGPgM1PObFk5hlHh6oxxnDQSWdOZmtAJTE1SVGV3XLxg+BKiavMszAs= +SHA256 (Pkgfile) = 868b2d81c149d59658d6b901aa6526f62f6f97d8a9fb156268d2486d413093ef +SHA256 (.footprint) = ca669a8aa5052329f2fb7897b5b74b0adf47d10e47cefe72cab790c72b141b70 +SHA256 (freeglut-3.2.2.tar.gz) = c5944a082df0bba96b5756dddb1f75d0cd72ce27b5395c6c1dde85c2ff297a50 diff --git a/freeglut-32/Pkgfile b/freeglut-32/Pkgfile index ebf2b28..0a721dd 100644 --- a/freeglut-32/Pkgfile +++ b/freeglut-32/Pkgfile @@ -4,13 +4,11 @@ # Depends on: freeglut glu-32 xorg-libxi-32 name=freeglut-32 -version=3.2.1 -release=2 -source=(https://downloads.sourceforge.net/project/freeglut/freeglut/$version/freeglu... - gcc10.patch) +version=3.2.2 +release=1 +source=(https://downloads.sourceforge.net/project/freeglut/freeglut/$version/freeglu...) build() { - patch -d freeglut-$version -p1 -i $SRC/gcc10.patch cmake -Sfreeglut-$version -Bbuild -GNinja \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/freeglut-32/gcc10.patch b/freeglut-32/gcc10.patch deleted file mode 100644 index cb85ee1..0000000 --- a/freeglut-32/gcc10.patch +++ /dev/null @@ -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 -