svn commit: r472637 - in head/graphics/Coin: . files
Adriaan de Groot
adridg at FreeBSD.org
Sun Jun 17 21:24:39 UTC 2018
Author: adridg
Date: Sun Jun 17 21:24:37 2018
New Revision: 472637
URL: https://svnweb.freebsd.org/changeset/ports/472637
Log:
The update to CMake 3.12 showed up compile failures (see the new patches,
all of which are from upstream). All of these show Clang being more strict
in its C++ than before.
Reported by: tcberner
Obtained from: upstream
Added:
head/graphics/Coin/files/patch-hg-11469.diff (contents, props changed)
head/graphics/Coin/files/patch-hg-11603.diff (contents, props changed)
head/graphics/Coin/files/patch-hg-11629.diff (contents, props changed)
Modified:
head/graphics/Coin/Makefile
Modified: head/graphics/Coin/Makefile
==============================================================================
--- head/graphics/Coin/Makefile Sun Jun 17 21:24:03 2018 (r472636)
+++ head/graphics/Coin/Makefile Sun Jun 17 21:24:37 2018 (r472637)
@@ -3,7 +3,7 @@
PORTNAME= Coin
PORTVERSION= 3.1.3
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= graphics
MASTER_SITES= https://bitbucket.org/Coin3D/coin/downloads/
Added: head/graphics/Coin/files/patch-hg-11469.diff
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/Coin/files/patch-hg-11469.diff Sun Jun 17 21:24:37 2018 (r472637)
@@ -0,0 +1,16 @@
+Fix compile, passing NULL isn't an integer for initializing a bool.
+
+From upstream revision 11469.
+
+diff -r a9e748858e58 -r d77c7249db51 src/profiler/SoProfilerVisualizeKit.cpp
+--- src/profiler/SoProfilerVisualizeKit.cpp Mon Feb 16 13:09:45 2015 +0000
++++ src/profiler/SoProfilerVisualizeKit.cpp Thu Feb 19 22:30:51 2015 +0100
+@@ -150,7 +150,7 @@
+ SO_KIT_ADD_FIELD(separatorsWithGLCaches, (NULL));
+
+ this->separatorsWithGLCaches.setNum(0);
+- this->separatorsWithGLCaches.setDefault(NULL);
++ this->separatorsWithGLCaches.setDefault(FALSE);
+ PRIVATE(this)->cacheSensor.reset(new SoFieldSensor(cacheSensorCB, this));
+ PRIVATE(this)->cacheSensor->attach(&this->separatorsWithGLCaches);
+ PRIVATE(this)->rootSensor.reset(new SoFieldSensor(rootChangedCB, this));
Added: head/graphics/Coin/files/patch-hg-11603.diff
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/Coin/files/patch-hg-11603.diff Sun Jun 17 21:24:37 2018 (r472637)
@@ -0,0 +1,28 @@
+Fix compile, don't narrow unsigned int to int.
+
+Path of the diff has been adjusted to reflect upstream file moves.
+From upstream revision 11603.
+
+diff -r cf80fb39af0b -r 3d88c63d65bb src/rendering/SoOffscreenRenderer.cpp
+--- src/misc/SoOffscreenRenderer.cpp Tue Sep 26 09:47:59 2017 +0200
++++ src/misc/SoOffscreenRenderer.cpp Tue Sep 26 09:49:30 2017 +0200
+@@ -432,7 +432,7 @@
+ size_t bufferbytesize;
+
+ CoinOffscreenGLCanvas glcanvas;
+- unsigned int glcanvassize[2];
++ int glcanvassize[2];
+
+ int numsubscreens[2];
+ // The subscreen size of the current tile. (Less than max if it's a
+@@ -1736,9 +1736,8 @@
+ if (renderaction->getNumPasses() > 1) {
+ SbVec3f jittervec;
+ SbMatrix m;
+- const int vpsize[2] = { this->glcanvassize[0], this->glcanvassize[1] };
+ coin_viewvolume_jitter(renderaction->getNumPasses(), renderaction->getCurPass(),
+- vpsize, (float *)jittervec.getValue());
++ this->glcanvassize, (float *)jittervec.getValue());
+ m.setTranslate(jittervec);
+ proj.multRight(m);
+ }
Added: head/graphics/Coin/files/patch-hg-11629.diff
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/Coin/files/patch-hg-11629.diff Sun Jun 17 21:24:37 2018 (r472637)
@@ -0,0 +1,27 @@
+NUL-terminate the string, instead of accidentally setting the
+pointer to NULL (which fails to compile on 12-CURRENT due to
+converting char to pointer).
+
+From upstream revision 11629.
+
+diff -r fbd6ca1c1436 -r 6008c4bd6ba6 src/3ds/SoStream.cpp
+--- src/3ds/SoStream.cpp Wed Aug 30 13:05:43 2017 +0200
++++ src/3ds/SoStream.cpp Wed Aug 30 13:06:50 2017 +0200
+@@ -185,7 +185,7 @@
+ if (!gotNum) { setBadBit(); return FALSE; } \
+ \
+ char *ce; \
+- s = '\0'; \
++ *s = '\0'; \
+ _convertType_ tempVal = _convertFunc_(buf, &ce, 0); \
+ \
+ if (ce != s) \
+@@ -282,7 +282,7 @@
+ gotAll: \
+ \
+ char *ce; \
+- s = '\0'; \
++ *s = '\0'; \
+ double tempVal = _convertFunc_(buf, &ce); \
+ \
+ if (ce != s) \
More information about the svn-ports-all
mailing list