<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/510a544211a193ce1589686253dc61de2f14e4ed">https://github.com/macports/macports-ports/commit/510a544211a193ce1589686253dc61de2f14e4ed</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 510a544211a193ce1589686253dc61de2f14e4ed
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Dec 17 10:38:27 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> openvdb: update version 6.1.0->7.0.0
</span>---
graphics/openimageio/Portfile | 2 +-
graphics/openvdb/Portfile | 21 ++++++++-------------
graphics/openvdb/files/patch-python_verison.diff | 24 +++++++++---------------
3 files changed, 18 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openimageio/Portfile b/graphics/openimageio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 00ce291..531716c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openimageio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openimageio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup cxx11 1.1
</span> PortGroup active_variants 1.1
github.setup OpenImageIO oiio 2.0.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> name openimageio
categories graphics
license BSD
<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 81fd0bd..2302052 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 active_variants 1.1
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup AcademySoftwareFoundation openvdb 6.1.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup AcademySoftwareFoundation openvdb 7.0.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> homepage https://www.openvdb.org/
categories graphics
license MPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,20 +18,18 @@ 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 3a6786cee02d404f98f1507c359837d9ca97e823 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6b832d207175f8396c6984cfc78e7f6b7b15f501536c03359bf3af9085dec509 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1865580
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7849e4e24d19a5b0338a54564b121bb3c0b58d2c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a55bea5914cbd5de60607cd94bb1fa946ff919d44fb75f1fcf1ab56defb67fd6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1874285
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2014
</span>
# /openvdb/../openvdb/version.h:226:8: error: unknown type name 'constexpr'
# inline constexpr const char* getLibraryVersionString() { return OPENVDB_LIBRARY_VERSION_STRING; }
compiler.blacklist-append *gcc* {clang < 920} {macports-clang-3.[0-9]} {macports-clang-[4-6].0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://github.com/AcademySoftwareFoundation/openvdb/issues/427
</span> # Find correct Python version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-python3.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-python_verison.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-python_verison.diff
</span>
configure.env-append BLOSC_ROOT=${prefix} \
TBB_ROOT=${prefix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,9 +59,6 @@ configure.args-append -DUSE_CCACHE=OFF \
</span> # do not "Build the OpenVDB unit tests" (avoid dependency on cppunit)
configure.args-append -DOPENVDB_BUILD_UNITTESTS=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# turn off Python support unless requested by a variant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DOPENVDB_BUILD_PYTHON_MODULE=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set pythons_suffixes {27 36 37 38}
set pythons_ports {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,7 +76,7 @@ foreach s ${pythons_suffixes} {
</span> port:py${s}-numpy \
port:boost-numpy
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DOPENVDB_BUILD_PYTHON_MODULE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DOPENVDB_BUILD_PYTHON_MODULE=ON \
</span> -DUSE_NUMPY=ON
post-patch {
<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><span style='display:block; white-space:pre;color:#808080;'>index 4b4796a..e58e2c2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openvdb/files/patch-python_verison.diff
</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;'>@@ -1,20 +1,14 @@
</span> --- openvdb/python/CMakeLists.txt.orig 2019-12-16 22:50:43.000000000 -0700
+++ openvdb/python/CMakeLists.txt 2019-12-16 22:51:32.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,7 +90,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Development and NumPy, specify all components at the same time when using
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # FindPython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,9 +104,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CMake >= 3.14
</span> if(USE_NUMPY)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Python ${MINIMUM_PYTHON_VERSION} REQUIRED COMPONENTS Interpreter Development NumPy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(Python __MACPORTS_PYTHON_VERSION__ EXACT REQUIRED COMPONENTS Interpreter Development NumPy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(Python_NumPy_VERSION VERSION_LESS MINIMUM_NUMPY_VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(FATAL_ERROR "Could NOT find NumPy (Required is at least version "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\"${MINIMUM_NUMPY_VERSION}\")"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -103,7 +103,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND OPENVDB_PYTHON_DEPS Python::NumPy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Python QUIET REQUIRED COMPONENTS Interpreter Development NumPy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(Python __MACPORTS_PYTHON_VERSION__ EXACT QUIET REQUIRED COMPONENTS Interpreter Development NumPy)
</span> else()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Python ${MINIMUM_PYTHON_VERSION} REQUIRED COMPONENTS Interpreter Development)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(Python __MACPORTS_PYTHON_VERSION__ EXACT REQUIRED COMPONENTS Interpreter Development)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND OPENVDB_PYTHON_DEPS Python::Python)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Python QUIET REQUIRED COMPONENTS Interpreter Development)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(Python __MACPORTS_PYTHON_VERSION__ EXACT QUIET REQUIRED COMPONENTS Interpreter Development)
</span> endif()
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_EXECUTABLE})
</span></pre><pre style='margin:0'>
</pre>