<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/24af796a9e7949dfbac3484a7f5cc5c47ec7a4dd">https://github.com/macports/macports-ports/commit/24af796a9e7949dfbac3484a7f5cc5c47ec7a4dd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 24af796a9e7949dfbac3484a7f5cc5c47ec7a4dd
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Apr 17 12:51:54 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> openvdb: update version 7.0.0->7.2.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Increase revision of dependencies because of library name change.
</span>---
graphics/blender/Portfile | 1 +
graphics/openimageio/Portfile | 6 ++++--
graphics/openvdb/Portfile | 23 +++++++--------------
graphics/openvdb/files/patch-find-glfw-deps.diff | 13 ------------
graphics/openvdb/files/patch-python_version.diff | 26 ++++++++++++++++--------
graphics/usd/Portfile | 1 +
6 files changed, 30 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/blender/Portfile b/graphics/blender/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c82cb27082c..9cbdd1df96b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/blender/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/blender/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,6 +7,7 @@ PortGroup active_variants 1.1
</span>
name blender
version 2.91.2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories graphics multimedia
platforms darwin
license GPL-2+
<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 aeea486b7db..816b00294c1 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 active_variants 1.1
</span> PortGroup compiler_blacklist_versions 1.0
github.setup OpenImageIO oiio 2.1.17.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> name openimageio
categories graphics
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,11 +22,13 @@ checksums rmd160 0df79ff10e8151b8a11d23ac56a60d3b73057147 \
</span> sha256 6f20536226f1da4fbf0d522815de47eef60a443f9b67a15705b96c34cc8921a7 \
size 29052379
<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> # error: multiple overloads of 'address' instantiate to the same signature 'const_pointer (const_reference) const noexcept'
# http://lists.llvm.org/pipermail/llvm-bugs/2013-November/031552.html
# Seen on OSX 10.9 and older.
compiler.blacklist-append {clang < 700}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# OpenVDB header files use C++14 features
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DCMAKE_CXX_STANDARD=14
</span>
compiler.thread_local_storage yes
<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 7e7a0d73112..87c0c402fa3 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 7.0.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup AcademySoftwareFoundation openvdb 7.2.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> homepage https://www.openvdb.org/
categories graphics
license {MPL-2 LGPL-2.1+}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,24 +18,15 @@ 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 7849e4e24d19a5b0338a54564b121bb3c0b58d2c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a55bea5914cbd5de60607cd94bb1fa946ff919d44fb75f1fcf1ab56defb67fd6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1874285
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b85de208ed29ab1675956f78fd867eeaaecc591d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1e929a7614e7b47d9b51c56c5e76c89cb3fef572d6a6affb89b45af2c81a297c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2289366
</span>
compiler.cxx_standard 2014
# Find correct Python version
patchfiles-append patch-python_version.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# OpenVDB does not currently correctly detect GLFW dependencies and falls
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# back to (incorrectly) requesting X11 dependencies. :-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# CMake Warning at cmake/OpenVDBGLFW3Setup.cmake:128 (message):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# GLFW does not have the INTERFACE_LINK_LIBRARIES property set, so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# hard-coding to expect a dependency on X11.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fixed upstream so this should be removed once in a release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/AcademySoftwareFoundation/openvdb/commit/a37f5cb89a45320c03824117277967e7d6d07ebe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-find-glfw-deps.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.env-append BLOSC_ROOT=${prefix} \
TBB_ROOT=${prefix} \
GLFW3_ROOT=${prefix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +53,7 @@ configure.args-append -DUSE_CCACHE=OFF \
</span> -DOPENVDB_BUILD_VDB_RENDER=ON \
-DOPENVDB_BUILD_VDB_VIEW=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# do not "Build the OpenVDB unit tests" (avoid dependency on cppunit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# do not "Build the OpenVDB unit tests" (avoid dependency on GoogleTest)
</span> configure.args-append -DOPENVDB_BUILD_UNITTESTS=OFF
set pythons_suffixes {27 36 37 38 39}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +77,7 @@ foreach s ${pythons_suffixes} {
</span> -DUSE_NUMPY=ON
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|__MACPORTS_PYTHON_VERSION__|${v}|g ${worksrcpath}/openvdb/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace s|__MACPORTS_PYTHON_VERSION__|${v}|g ${worksrcpath}/openvdb/openvdb/python/CMakeLists.txt
</span> }
require_active_variants boost ${p}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openvdb/files/patch-find-glfw-deps.diff b/graphics/openvdb/files/patch-find-glfw-deps.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 355c2a8e5f0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openvdb/files/patch-find-glfw-deps.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/cmake/OpenVDBGLFW3Setup.cmake b/cmake/OpenVDBGLFW3Setup.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 84e54d9..669c600 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/OpenVDBGLFW3Setup.cmake.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/OpenVDBGLFW3Setup.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -118,7 +118,7 @@ unset(glfw3_FIND_VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # GLFW 3.1 does not export INTERFACE_LINK_LIBRARIES so detect this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and set the property ourselves
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # @todo investigate how this might apply for Mac OSX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(UNIX AND NOT APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get_property(glfw3_HAS_INTERFACE_LINK_LIBRARIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TARGET glfw
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PROPERTY INTERFACE_LINK_LIBRARIES
</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 794071a2644..a9986e52fe2 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,14 +1,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- openvdb/python/CMakeLists.txt.orig 2019-12-16 22:50:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ openvdb/python/CMakeLists.txt 2019-12-16 22:51:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,9 +104,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- openvdb/openvdb/python/CMakeLists.txt.orig 2021-03-17 15:42:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ openvdb/openvdb/python/CMakeLists.txt 2021-04-17 12:41:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,16 +94,16 @@
</span> else()
# CMake >= 3.14
<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 REQUIRED COMPONENTS Interpreter Development NumPy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(Python __MACPORTS_PYTHON_VERSION__ EXACT QUIET REQUIRED COMPONENTS Interpreter Development NumPy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(OPENVDB_BUILD_PYTHON_UNITTESTS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Python QUIET COMPONENTS Interpreter Development)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(Python __MACPORTS_PYTHON_VERSION__ EXACT QUIET COMPONENTS Interpreter Development)
</span> else()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Python QUIET REQUIRED COMPONENTS Interpreter Development)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(Python __MACPORTS_PYTHON_VERSION__ EXACT QUIET REQUIRED COMPONENTS Interpreter Development)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Python QUIET COMPONENTS Development)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(Python __MACPORTS_PYTHON_VERSION__ EXACT QUIET COMPONENTS Development)
</span> endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_EXECUTABLE})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND OPENVDB_PYTHON_DEPS Python::Python)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(USE_NUMPY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Python QUIET COMPONENTS NumPy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(Python __MACPORTS_PYTHON_VERSION__ EXACT QUIET COMPONENTS NumPy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT TARGET Python::NumPy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(FATAL_ERROR "Could NOT find NumPy (Required is at least version "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\"${MINIMUM_NUMPY_VERSION}\")"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/usd/Portfile b/graphics/usd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aa4d8d72087..6f505bbedfc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/usd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/usd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,6 +9,7 @@ PortGroup legacysupport 1.0
</span>
github.setup PixarAnimationStudios USD 20.05 v
name usd
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories graphics
platforms darwin
license Apache-2
</pre><pre style='margin:0'>
</pre>