<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6059b74d6775bf8b1e683e4444c3dbd7b161157c">https://github.com/macports/macports-ports/commit/6059b74d6775bf8b1e683e4444c3dbd7b161157c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6059b74d6775bf8b1e683e4444c3dbd7b161157c
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sat Apr 22 22:47:32 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> openvdb: update to 10.0.1; default +python311
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/66463
</span>---
graphics/openvdb/Portfile | 12 ++++++------
graphics/openvdb/files/patch-python_version.diff | 20 +++++++-------------
2 files changed, 13 insertions(+), 19 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 cec5a1fa0c0..ab40663204a 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;'>@@ -7,7 +7,7 @@ PortGroup active_variants 1.1
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup AcademySoftwareFoundation openvdb 8.1.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup AcademySoftwareFoundation openvdb 10.0.1 v
</span> revision 0
categories graphics
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,9 +27,9 @@ long_description OpenVDB is an open source C++ library \
</span> encountered in computer-generated graphics and \
animation.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 35d98cf9e057ea8e0a5f0146ef23548144ea4b40 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0d0a3706108ce84012a2f1834d8746f3218cd3203fb0485aa0754561d1a0d391 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2621095
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 acf32c4e91b9ff05863ff3966f33de144fec05a2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2b5dee3f2d5e1802c44d040856c6ddb440af4c959286799f8c8e3d0ee9842a7a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3464059
</span>
compiler.cxx_standard 2014
# error: cannot refer to variable template 'Contains' without a template
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,7 +99,7 @@ variant logging description {Build and enable logging support} {
</span>
default_variants +docs +jemalloc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_suffixes {27 37 38 39 310}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_suffixes {27 37 38 39 310 311}
</span> set python_ports {}
foreach s $python_suffixes {
lappend python_ports python$s
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,5 +141,5 @@ foreach s $python_suffixes {
</span> # this default version should stay synchronized with default
# boost python variant
if {$set_python_default} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +python39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +python311
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openvdb/files/patch-python_version.diff b/graphics/openvdb/files/patch-python_version.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e0d290a9cad..0fe956ff784 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openvdb/files/patch-python_version.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openvdb/files/patch-python_version.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,10 @@
</span> --- openvdb/openvdb/python/CMakeLists.txt.orig 2021-02-05 14:21:38.000000000 -0500
+++ openvdb/openvdb/python/CMakeLists.txt 2021-12-05 13:11:13.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,11 +90,11 @@
</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:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(Python __MACPORTS_PYTHON_VERSION__ EXACT QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,6 +104,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if(USE_NUMPY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Python QUIET COMPONENTS NumPy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(Python __MACPORTS_PYTHON_VERSION__ EXACT QUIET COMPONENTS NumPy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT TARGET Python::NumPy)
</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:#e0ffe0;'>+ # Make sure find_package(Python) is only ever invoked once with all required components
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_package(Python COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_package(Python __MACPORTS_PYTHON_VERSION__ EXACT COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openvdb_check_python_version(Python::Module
</span></pre><pre style='margin:0'>
</pre>