Index: head/misc/openvdb/Makefile =================================================================== --- head/misc/openvdb/Makefile (revision 530237) +++ head/misc/openvdb/Makefile (revision 530238) @@ -1,51 +1,51 @@ # $FreeBSD$ PORTNAME= openvdb DISTVERSIONPREFIX= v DISTVERSION= 6.1.0 PORTREVISION= 8 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org COMMENT= Tools for storage and manipulation of sparse volumetric data LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libblosc.so:archivers/c-blosc \ libboost_system.so:devel/boost-libs \ libHalf.so:graphics/ilmbase \ libtbb.so:devel/tbb USES= cmake compiler:c++11-lang localbase:ldflags pkgconfig USE_GITHUB= yes GH_ACCOUNT= AcademySoftwareFoundation USE_LDCONFIG= yes CMAKE_OFF= OPENVDB_CORE_STATIC OPTIONS_DEFINE= PYTHON TOOLS DOCS # TOOLS should be a subpackage OPTIONS_DEFAULT= PYTHON TOOLS OPTIONS_SUB= yes -PYTHON_USES= python:2.7 # 3.6 is broken: https://github.com/AcademySoftwareFoundation/openvdb/issues/427 +PYTHON_USES= python PYTHON_CMAKE_BOOL= OPENVDB_BUILD_PYTHON_MODULE PYTHON_CMAKE_ON= -DFREEBSD_PYTHON_VER:STRING=${PYTHON_VER} -DUSE_NUMPY:BOOL=ON PYTHON_LIB_DEPENDS= ${PY_BOOST} PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY} TOOLS_DESC= Build CLI tools TOOLS_CMAKE_BOOL= OPENVDB_BUILD_BINARIES OPENVDB_BUILD_VDB_LOD \ OPENVDB_BUILD_VDB_RENDER OPENVDB_BUILD_VDB_VIEW TOOLS_LIB_DEPENDS= libglfw.so:graphics/glfw \ libIlmImf.so:graphics/openexr TOOLS_USES= gl xorg TOOLS_USE= GL=gl,glu XORG=x11,xcursor,xi,xinerama,xrandr,xxf86vm DOCS_CMAKE_BOOL= OPENVDB_BUILD_DOCS DOCS_BUILD_DEPENDS= doxygen:devel/doxygen PORTDOCS= * .include Index: head/misc/openvdb/files/patch-openvdb_python_pyOpenVDBModule.cc =================================================================== --- head/misc/openvdb/files/patch-openvdb_python_pyOpenVDBModule.cc (nonexistent) +++ head/misc/openvdb/files/patch-openvdb_python_pyOpenVDBModule.cc (revision 530238) @@ -0,0 +1,26 @@ +--- openvdb/python/pyOpenVDBModule.cc.orig 2019-05-07 20:58:35 UTC ++++ openvdb/python/pyOpenVDBModule.cc +@@ -320,7 +320,11 @@ struct PointIndexConverter + /// @return nullptr if the given Python object is not convertible to the PointIndex. + static void* convertible(PyObject* obj) + { ++#if PY_MAJOR_VERSION >= 3 ++ if (!PyLong_Check(obj)) return nullptr; // not a Python integer ++#else + if (!PyInt_Check(obj)) return nullptr; // not a Python integer ++#endif + return obj; + } + +@@ -337,7 +341,11 @@ struct PointIndexConverter + // Extract the PointIndex from the python integer + PointIndexT* index = static_cast(storage); + ++#if PY_MAJOR_VERSION >= 3 ++ *index = static_cast(PyLong_AsLong(obj)); ++#else + *index = static_cast(PyInt_AsLong(obj)); ++#endif + } + + /// Register both the PointIndex-to-integer and the integer-to-PointIndex converters. Property changes on: head/misc/openvdb/files/patch-openvdb_python_pyOpenVDBModule.cc ___________________________________________________________________ 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