<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/57413efe60268434249ffe8e20219eecb5d8ba4a">https://github.com/macports/macports-ports/commit/57413efe60268434249ffe8e20219eecb5d8ba4a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 57413ef  openvdb: update version 6.0.0->6.1.0
</span>57413ef is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 57413efe60268434249ffe8e20219eecb5d8ba4a
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Jun 8 04:21:39 2019 -0700

<span style='display:block; white-space:pre;color:#404040;'>    openvdb: update version 6.0.0->6.1.0
</span>---
 graphics/openvdb/Portfile                          | 51 +++++++++---------
 .../openvdb/files/patch-boost_python_libs.diff     | 11 ----
 .../openvdb/files/patch-boost_python_name.diff     | 35 ++++++++----
 graphics/openvdb/files/patch-no_ccache.diff        | 15 ------
 graphics/openvdb/files/patch-python3.diff          | 62 ++++++++++++++++++++++
 graphics/openvdb/files/patch-python_cxx11.diff     | 10 ----
 graphics/openvdb/files/patch-python_verison.diff   | 11 ++++
 7 files changed, 121 insertions(+), 74 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openvdb/Portfile b/graphics/openvdb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 17a473b..e8ea6cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openvdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openvdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,8 @@ PortGroup               cmake 1.1
</span> PortGroup               cxx11 1.1
 PortGroup               active_variants 1.1
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup            AcademySoftwareFoundation openvdb 6.0.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage                http://www.openvdb.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup            AcademySoftwareFoundation openvdb 6.1.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage                https://www.openvdb.org/
</span> categories              graphics
 license                 MPL-2
 maintainers             {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,19 +17,16 @@ long_description        OpenVDB is an open source C++ library comprising a novel
</span>                         sparse volumetric data discretized on three-dimensional grids.
 platforms               darwin
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums               rmd160  5923bb445dbd9b55ef84a35ad4beebb072bc6677 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  9e7940c628ff2c8d47bc07d09f26c9e19370bc0807f91f15b7fa45f581c308c7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    1808199
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums               rmd160  3a6786cee02d404f98f1507c359837d9ca97e823 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  6b832d207175f8396c6984cfc78e7f6b7b15f501536c03359bf3af9085dec509 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    1865580
</span> 
 # openvdb/python/CMakeLists.txt has incorrect (for MacPorts) boost python file name
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Python calls libraries that require C++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Include correct Python Boost libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# avoid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#    ccache: error: Failed to create directory ${prefix}/var/macports/build/.ccache/tmp: Operation not permitted
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://github.com/AcademySoftwareFoundation/openvdb/issues/427
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Find correct Python version
</span> patchfiles-append       patch-boost_python_name.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        patch-python_cxx11.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        patch-boost_python_libs.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        patch-no_ccache.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                         patch-python3.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                         patch-python_verison.diff
</span> 
 configure.env-append    BLOSC_ROOT=${prefix} \
                         TBB_ROOT=${prefix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +34,8 @@ configure.env-append    BLOSC_ROOT=${prefix} \
</span>                         ILMBASE_ROOT=${prefix} \
                         OPENEXR_ROOT=${prefix}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append    port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append      port:zlib \
                         port:boost \
                         port:blosc \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,9 +46,12 @@ depends_lib-append      port:zlib \
</span> 
 # FindOpenEXR.cmake guesses wrong on how to include version number in library name
 # use GLFW version 3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# avoid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#    ccache: error: Failed to create directory ${prefix}/var/macports/build/.ccache/tmp: Operation not permitted
</span> # use latest ABI version (default is 3)
 configure.args-append   -DOPENEXR_NAMESPACE_VERSIONING=OFF \
                         -DUSE_GLFW3=ON \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DUSE_CCACHE=OFF \
</span>                         -DOPENVDB_ABI_VERSION_NUMBER=[lindex [split ${version} .] 0]
 
 # do not "Build the OpenVDB unit tests" (avoid dependency on cppunit)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,11 +61,9 @@ variant python27 description {Build the Python 2.7 bindings} conflicts python36
</span>     depends_lib-append \
         port:python27 \
         port:py27-numpy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        -DPYTHON_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/2.7/Python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        -DPYOPENVDB_INSTALL_DIRECTORY=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|__MACPORTS_PYTHON_VERSION__|2.7|g" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span>     require_active_variants boost python27
 }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,11 +71,9 @@ variant python36 description {Build the Python 3.6 bindings} conflicts python27
</span>     depends_lib-append \
         port:python36 \
         port:py36-numpy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        -DPYTHON_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/3.6/bin/python3.6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/3.6/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/3.6/Python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        -DPYOPENVDB_INSTALL_DIRECTORY=${frameworks_dir}/Python.framework/Versions/3.6/lib/python3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|__MACPORTS_PYTHON_VERSION__|3.6|g" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span>     require_active_variants boost python36
 }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,11 +81,9 @@ variant python37 description {Build the Python 3.7 bindings} conflicts python27
</span>     depends_lib-append \
         port:python37 \
         port:py37-numpy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        -DPYTHON_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/3.7/bin/python3.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/3.7/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/3.7/Python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        -DPYOPENVDB_INSTALL_DIRECTORY=${frameworks_dir}/Python.framework/Versions/3.7/lib/python3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|__MACPORTS_PYTHON_VERSION__|3.7|g" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span>     require_active_variants boost python37
 }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,4 +93,5 @@ if {![variant_isset python36] && ![variant_isset python37]} {
</span> 
 if {![variant_isset python27] && ![variant_isset python36] && ![variant_isset python37]} {
     configure.args-append -DOPENVDB_BUILD_PYTHON_MODULE=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-delete     patch-python_verison.diff
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openvdb/files/patch-boost_python_libs.diff b/graphics/openvdb/files/patch-boost_python_libs.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 99c7ebc..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openvdb/files/patch-boost_python_libs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- openvdb/python/CMakeLists.txt.orig     2019-02-01 04:59:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ openvdb/python/CMakeLists.txt  2019-02-01 04:59:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -94,7 +94,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   ${GLFW_LINK_LIBRARY}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   ${GLFW_DEPENDENT_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   ${GLEW_GLEW_LIBRARY}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  ${Boost_PYTHON_LIBRARY}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  ${Boost_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   ${PYTHON_LIBRARY}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   ${Ilmbase_HALF_LIBRARY}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openvdb/files/patch-boost_python_name.diff b/graphics/openvdb/files/patch-boost_python_name.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f5faeb..2c03341 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openvdb/files/patch-boost_python_name.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openvdb/files/patch-boost_python_name.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,28 @@
</span> --- openvdb/python/CMakeLists.txt.orig    2018-12-18 05:27:52.000000000 -0700
 +++ openvdb/python/CMakeLists.txt      2019-02-01 04:52:46.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,7 +3,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -113,12 +113,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Prioritize the version suffixed library, failing if neither exist.
</span>  
<span style='display:block; white-space:pre;background:#ffe0e0;'>- FIND_PACKAGE ( PythonInterp REQUIRED )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FIND_PACKAGE ( PythonLibs REQUIRED )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IF ( PYTHON_VERSION_MAJOR GREATER 2 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${PYTHON_VERSION_MAJOR} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ELSE ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ENDIF ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(Boost ${MINIMUM_BOOST_VERSION}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  QUIET COMPONENTS python${Python_VERSION_MAJOR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span>  
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF ( NOT OPENVDB_BUILD_CORE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(TARGET Boost::python${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  set(BOOST_PYTHON_LIB "python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  message(STATUS "Found boost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(TARGET Boost::python${Python_VERSION_MAJOR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  set(BOOST_PYTHON_LIB "python${Python_VERSION_MAJOR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  message(STATUS "Found boost_python${Python_VERSION_MAJOR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   find_package(Boost ${MINIMUM_BOOST_VERSION}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     QUIET COMPONENTS python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,7 +130,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     message(FATAL_ERROR "Unable to find boost_python or "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      "boost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      "boost_python${Python_VERSION_MAJOR}."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openvdb/files/patch-no_ccache.diff b/graphics/openvdb/files/patch-no_ccache.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0309f20..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openvdb/files/patch-no_ccache.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig    2018-12-18 05:27:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2019-02-01 04:55:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,12 +32,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENABLE_TESTING()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--find_program(CCACHE_FOUND ccache)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(CCACHE_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif(CCACHE_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPTION ( OPENVDB_BUILD_UNITTESTS "Build the OpenVDB unit tests" ON )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPTION ( OPENVDB_BUILD_DOCS "Build the OpenVDB documentation" OFF )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPTION ( OPENVDB_BUILD_PYTHON_MODULE "Build the pyopenvdb Python module" ON )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openvdb/files/patch-python3.diff b/graphics/openvdb/files/patch-python3.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..74a3561
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openvdb/files/patch-python3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,62 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8f12e3c2e0232456eff06642e1620a9538811f29 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 11 May 2019 14:27:50 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fixes for Python3 and loading the python module on MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openvdb/python/CMakeLists.txt     | 9 ++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openvdb/python/pyOpenVDBModule.cc | 9 ++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 16 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c1e7a2b2..b255483a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- openvdb/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ openvdb/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -182,9 +182,16 @@ target_link_libraries(pyopenvdb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(pyopenvdb PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  PREFIX ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  PREFIX ""  # no 'lib' prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  # must be .so (not .dylib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  set_target_properties(pyopenvdb PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    SUFFIX ".so"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(OPENVDB_ENABLE_RPATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # @todo There is probably a better way to do this for imported targets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(RPATHS "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/openvdb/python/pyOpenVDBModule.cc b/openvdb/python/pyOpenVDBModule.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b41095bb..5f423176 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- openvdb/python/pyOpenVDBModule.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ openvdb/python/pyOpenVDBModule.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -320,7 +320,11 @@ struct PointIndexConverter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     /// @return nullptr if the given Python object is not convertible to the PointIndex.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     static void* convertible(PyObject* obj)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PY_MAJOR_VERSION >= 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if (!PyLong_Check(obj)) return nullptr; // not a Python integer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if (!PyInt_Check(obj)) return nullptr; // not a Python integer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return obj;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -336,8 +340,11 @@ struct PointIndexConverter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         // Extract the PointIndex from the python integer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         PointIndexT* index = static_cast<PointIndexT*>(storage);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PY_MAJOR_VERSION >= 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        *index = static_cast<IntType>(PyLong_AsLong(obj));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         *index = static_cast<IntType>(PyInt_AsLong(obj));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     /// Register both the PointIndex-to-integer and the integer-to-PointIndex converters.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openvdb/files/patch-python_cxx11.diff b/graphics/openvdb/files/patch-python_cxx11.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3a8485b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openvdb/files/patch-python_cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- openvdb/python/CMakeLists.txt.orig     2019-02-01 04:57:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ openvdb/python/CMakeLists.txt  2019-02-01 04:57:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,6 +9,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(CMAKE_CXX_STANDARD 11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF ( NOT OPENVDB_BUILD_CORE )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   FIND_PACKAGE ( OpenVDB REQUIRED )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openvdb/files/patch-python_verison.diff b/graphics/openvdb/files/patch-python_verison.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ef7cf1d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openvdb/files/patch-python_verison.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig    2019-05-07 13:58:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2019-06-08 03:00:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -177,7 +177,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(MINIMUM_ZLIB_VERSION 1.2.7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(MINIMUM_TBB_VERSION 4.4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  set(MINIMUM_PYTHON_VERSION 2.7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  set(MINIMUM_PYTHON_VERSION __MACPORTS_PYTHON_VERSION__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(MINIMUM_NUMPY_VERSION 1.9.2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(MINIMUM_CPPUNIT_VERSION 1.10)
</span></pre><pre style='margin:0'>

</pre>