Date: Mon, 19 Oct 2020 23:55:53 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r552777 - in head/graphics/dilay: . files Message-ID: <202010192355.09JNtrAM003333@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Mon Oct 19 23:55:53 2020 New Revision: 552777 URL: https://svnweb.freebsd.org/changeset/ports/552777 Log: graphics/dilay: fix signedness build problems on powerpc*, aarch64 and armv* MFH: 2020Q4 (fix build blanket) Added: head/graphics/dilay/files/ head/graphics/dilay/files/patch-lib_src_isosurface-extraction_grid.cpp (contents, props changed) Modified: head/graphics/dilay/Makefile Modified: head/graphics/dilay/Makefile ============================================================================== --- head/graphics/dilay/Makefile Mon Oct 19 23:33:28 2020 (r552776) +++ head/graphics/dilay/Makefile Mon Oct 19 23:55:53 2020 (r552777) @@ -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 \ Added: head/graphics/dilay/files/patch-lib_src_isosurface-extraction_grid.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/dilay/files/patch-lib_src_isosurface-extraction_grid.cpp Mon Oct 19 23:55:53 2020 (r552777) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010192355.09JNtrAM003333>