cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r552777

Browse Source 
graphics/dilay: fix signedness build problems on powerpc*, aarch64 and armv*

Approved by:	portmgr (fix build blanket)
This commit is contained in:
Piotr Kubaj 2020-10-19 23:56:38 +00:00
parent eddf1083ca
commit 789ec24a7a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q4/; revision=552778
2 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/dilay/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= dilay
DISTVERSION= 1.9.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= graphics
MAINTAINER= yuri@FreeBSD.org
@ -21,8 +21,6 @@ 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 \

44
graphics/dilay/files/patch-lib_src_isosurface-extraction_grid.cpp Normal file
View File

@ -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);