svn commit: r519203 - in branches/2019Q4/misc/openvdb: . files

[Mark Linimon]

Author: linimon
Date: Sat Dec  7 12:14:22 2019
New Revision: 519203
URL: https://svnweb.freebsd.org/changeset/ports/519203

Log:
  MFH: r514338
  
  misc/openvdb: fix build on GCC architectures
  
  Compiling on GCC architectures fails:
  /wrkdirs/usr/ports/misc/openvdb/work/openvdb-6.1.0/openvdb/points/AttributeSet.cc: In member function 'openvdb::v6_1::points::AttributeSet::Descriptor::Ptr openvdb::v6_1::points::AttributeSet::Descriptor::duplicateDrop(const std::vector<long unsigned int>&) const':
  /wrkdirs/usr/ports/misc/openvdb/work/openvdb-6.1.0/openvdb/points/AttributeSet.cc:875:59: error: 'CHAR_BIT' was not declared in this scope
    875 |             const size_t GROUP_BITS = sizeof(GroupType) * CHAR_BIT;
        |                                                           ^~~~~~~~
  /wrkdirs/usr/ports/misc/openvdb/work/openvdb-6.1.0/openvdb/points/AttributeSet.cc:35:1: note: 'CHAR_BIT' is defined in header '<climits>'; did you forget to '#include <climits>'?
     34 | #include "AttributeGroup.h"
    +++ |+#include <climits>
     35 |
  
  While here, add USES=xorg for TOOLS option.
  
  PR:             240630
  Approved by:    portmgr (tier-2 blanket)

Added:
  branches/2019Q4/misc/openvdb/files/patch-openvdb_points_AttributeSet.cc
     - copied unchanged from r514338, head/misc/openvdb/files/patch-openvdb_points_AttributeSet.cc
Modified:
  branches/2019Q4/misc/openvdb/Makefile
Directory Properties:
  branches/2019Q4/   (props changed)

Modified: branches/2019Q4/misc/openvdb/Makefile
==============================================================================
--- branches/2019Q4/misc/openvdb/Makefile	Sat Dec  7 11:52:27 2019	(r519202)
+++ branches/2019Q4/misc/openvdb/Makefile	Sat Dec  7 12:14:22 2019	(r519203)
@@ -40,7 +40,7 @@ TOOLS_CMAKE_BOOL=	OPENVDB_BUILD_BINARIES OPENVDB_BUILD
 			OPENVDB_BUILD_VDB_RENDER OPENVDB_BUILD_VDB_VIEW
 TOOLS_LIB_DEPENDS=	libglfw.so:graphics/glfw \
 			libIlmImf.so:graphics/openexr
-TOOLS_USES=		gl
+TOOLS_USES=		gl xorg
 TOOLS_USE=		GL=gl,glu XORG=x11,xcursor,xi,xinerama,xrandr,xxf86vm
 
 DOCS_CMAKE_BOOL=	OPENVDB_BUILD_DOCS

Copied: branches/2019Q4/misc/openvdb/files/patch-openvdb_points_AttributeSet.cc (from r514338, head/misc/openvdb/files/patch-openvdb_points_AttributeSet.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2019Q4/misc/openvdb/files/patch-openvdb_points_AttributeSet.cc	Sat Dec  7 12:14:22 2019	(r519203, copy of r514338, head/misc/openvdb/files/patch-openvdb_points_AttributeSet.cc)
@@ -0,0 +1,10 @@
+--- openvdb/points/AttributeSet.cc.orig	2019-09-16 16:50:50 UTC
++++ openvdb/points/AttributeSet.cc
+@@ -34,6 +34,7 @@
+ #include "AttributeGroup.h"
+ 
+ #include <algorithm> // std::equal
++#include <climits> // CHAR_BIT
+ #include <string>
+ 
+ namespace openvdb {