Index: head/graphics/dilay/Makefile =================================================================== --- head/graphics/dilay/Makefile (revision 552776) +++ head/graphics/dilay/Makefile (revision 552777) @@ -1,34 +1,32 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= dilay DISTVERSION= 1.9.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org COMMENT= 3D sculpting application LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${LOCALBASE}/include/glm/glm.hpp:math/glm USES= compiler:c++14-lang gl gmake qmake qt:5 USE_GITHUB= yes GH_ACCOUNT= abau USE_CXXSTD= c++14 USE_GL= gl USE_QT= core gui opengl widgets xml buildtools_build -CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}} -CXXFLAGS_gcc= -Wno-narrowing MAKE_JOBS_UNSAFE= yes # Workaround for: https://github.com/abau/dilay/issues/19 parallel build fails (still a problem despite having been closed) PLIST_FILES= bin/dilay \ share/applications/dilay.desktop .for sz in 16 32 48 256 PLIST_FILES+= share/icons/hicolor/${sz}x${sz}/apps/dilay.png .endfor .include Index: head/graphics/dilay/files/patch-lib_src_isosurface-extraction_grid.cpp =================================================================== --- head/graphics/dilay/files/patch-lib_src_isosurface-extraction_grid.cpp (nonexistent) +++ head/graphics/dilay/files/patch-lib_src_isosurface-extraction_grid.cpp (revision 552777) @@ -0,0 +1,44 @@ +--- lib/src/isosurface-extraction/grid.cpp.orig 2020-10-19 21:28:22 UTC ++++ lib/src/isosurface-extraction/grid.cpp +@@ -50,7 +50,7 @@ namespace + false, true, false, true, false, false, false, false, false, false, false, false, true, + false, false, true, false, false, false, false, false, false}; + +- static char vertexIndicesByConfiguration[256][12] = { ++ static signed char vertexIndicesByConfiguration[256][12] = { + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 0, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, -1, -1, -1, 0, 0, -1, -1, -1, -1, -1, -1}, +@@ -313,7 +313,7 @@ namespace + + unsigned char numVertices (unsigned char configuration) + { +- char n = -1; ++ signed char n = -1; + for (unsigned char i = 0; i < 12; i++) + { + n = std::max (n, vertexIndicesByConfiguration[configuration][i]); +@@ -375,10 +375,10 @@ namespace + const unsigned char edge3 = edgeIndicesByFace[i][2]; + const unsigned char edge4 = edgeIndicesByFace[i][3]; + +- const char vertex1 = vertexIndicesByConfiguration[this->configuration][edge1]; +- const char vertex2 = vertexIndicesByConfiguration[this->configuration][edge2]; +- const char vertex3 = vertexIndicesByConfiguration[this->configuration][edge3]; +- const char vertex4 = vertexIndicesByConfiguration[this->configuration][edge4]; ++ const signed char vertex1 = vertexIndicesByConfiguration[this->configuration][edge1]; ++ const signed char vertex2 = vertexIndicesByConfiguration[this->configuration][edge2]; ++ const signed char vertex3 = vertexIndicesByConfiguration[this->configuration][edge3]; ++ const signed char vertex4 = vertexIndicesByConfiguration[this->configuration][edge4]; + + if (vertex1 != -1 && vertex2 != -1 && vertex3 != -1 && vertex4 != -1) + { +@@ -633,7 +633,7 @@ struct IsosurfaceExtractionGrid::Impl + } + + bool hasAmbiguousNeighbor (const Cube& cube, unsigned int x, unsigned int y, unsigned int z, +- unsigned char ambiguousFace, char dim) ++ unsigned char ambiguousFace, signed char dim) + { + assert (cube.nonManifoldConfig ()); + assert (dim == -3 || dim == -2 || dim == -1 || dim == 1 || dim == 2 || dim == 3); Property changes on: head/graphics/dilay/files/patch-lib_src_isosurface-extraction_grid.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property