diff --git a/freeglut/.signature b/freeglut/.signature index e0105c141..1c8fa8a02 100644 --- a/freeglut/.signature +++ b/freeglut/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/UoSYjG5jXhLvKjLAuBUuxgJ/Utr7VBVGAP8Ywh8IVLzB6BmjMQNPUQKoNhIXcBhKIHjsk+Bv5F6Pi/wvRri1QA= -SHA256 (Pkgfile) = 8d10e8a0d213c089df9b31a0037f967809c68e7e4211fc02d9193eb2cc5f1169 +RWSE3ohX2g5d/Z7tNl58Vtx8gTGYcj0/BNPS6O5DoZEDdeQuBQauujrMqKEcv8pw7K+liM0ekVHC/6vGhltH00VBprzTMjqZiQU= +SHA256 (Pkgfile) = 9acfdef672f13ec4b1d64f62145a766be2d78d617ba8751b1bc18fef8c55d147 SHA256 (.footprint) = e1456ea754b868b14d770c08b877d10d842f5ea84e5170911f187ecdf7d7eedc SHA256 (freeglut-3.2.1.tar.gz) = d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68 +SHA256 (gcc10.patch) = ce2d11ffbffda1872dde5d50198fa5de961c22716e29fb1715648b7b818222c5 diff --git a/freeglut/Pkgfile b/freeglut/Pkgfile index cdca64fc4..e1fe875ad 100644 --- a/freeglut/Pkgfile +++ b/freeglut/Pkgfile @@ -5,22 +5,20 @@ name=freeglut version=3.2.1 -release=1 -source=(https://downloads.sourceforge.net/$name/$name-$version.tar.gz) +release=2 +source=(https://downloads.sourceforge.net/$name/$name-$version.tar.gz + gcc10.patch) build() { - cd $name-$version + patch -d $name-$version -p1 -i $SRC/gcc10.patch - install -d build - cd build - - cmake .. \ + cmake -S$name-$version -Bbuild -GNinja \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=Release - make - make DESTDIR=$PKG install + cmake --build build + DESTDIR=$PKG cmake --install build ln -s glut.pc $PKG/usr/lib/pkgconfig/freeglut.pc } diff --git a/freeglut/gcc10.patch b/freeglut/gcc10.patch new file mode 100644 index 000000000..cb85ee115 --- /dev/null +++ b/freeglut/gcc10.patch @@ -0,0 +1,48 @@ +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 + diff --git a/rust-bin/.signature b/rust-bin/.signature index c4164be86..a96c12675 100644 --- a/rust-bin/.signature +++ b/rust-bin/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Zd4sbHZhZyO2/xHS1CB0IxloCyWy78XaMAmMXpZFj0a7mviOauJrA30e0bgk2xx2cfg+sbCmEaoTRji8bmvkg0= -SHA256 (Pkgfile) = 2be589ca0f17b6a22c497dddbee36bb62212eb9964856bda654ffc8c141f978a +RWSE3ohX2g5d/R+4tuHl4XK+G6jiFFV+N9m4rpQMj4W/T3h+7W/5eWFhHH6QVP+pmtBTkFKZ6qxBPV/PaBMmNldf6ANiCymKMQo= +SHA256 (Pkgfile) = 7ddbf6beb4d2abb22e8d3a6b8a1d0b6a387a87efda6377b09263237a430ac04a SHA256 (.footprint) = b1f2e5cf9c865c370c98cc1b381c4c21429282d022ced346d17b31e691caa02f -SHA256 (rust-1.45.1-1-crux-3.5-bin.tar.xz) = b6a8e8e44b5576140542ad9d5499a80a8cc1fdc83a2c3f92f76fb1f498637467 +SHA256 (rust-1.45.1-2-crux-3.5-bin.tar.xz) = 734b68871923c38e1d0bb50a84224745284202e202a24fc1f032b44820f8c12e diff --git a/rust-bin/Pkgfile b/rust-bin/Pkgfile index 424ad0f40..1333dad40 100644 --- a/rust-bin/Pkgfile +++ b/rust-bin/Pkgfile @@ -6,7 +6,7 @@ name=rust-bin version=1.45.1 -release=1 +release=2 source=(https://crux.ster.zone/downloads/rust/rust-$version-$release-crux-3.5-bin.tar.xz) build() {