<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/8619a2ea4027bd58d9553e0e4428595773249c13">https://github.com/macports/macports-ports/commit/8619a2ea4027bd58d9553e0e4428595773249c13</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8619a2ea4027bd58d9553e0e4428595773249c13
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Dec 18 21:40:41 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> openvdb: remove unused patch file
</span>---
graphics/openvdb/files/patch-python3.diff | 62 -------------------------------
1 file changed, 62 deletions(-)
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 74a3561..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openvdb/files/patch-python3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,62 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 8f12e3c2e0232456eff06642e1620a9538811f29 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 11 May 2019 14:27:50 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fixes for Python3 and loading the python module on MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- openvdb/python/CMakeLists.txt | 9 ++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- openvdb/python/pyOpenVDBModule.cc | 9 ++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 16 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c1e7a2b2..b255483a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- openvdb/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ openvdb/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -182,9 +182,16 @@ target_link_libraries(pyopenvdb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_target_properties(pyopenvdb PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PREFIX ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PREFIX "" # no 'lib' prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # must be .so (not .dylib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_target_properties(pyopenvdb PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SUFFIX ".so"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</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;'>- if(OPENVDB_ENABLE_RPATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # @todo There is probably a better way to do this for imported targets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(RPATHS "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/openvdb/python/pyOpenVDBModule.cc b/openvdb/python/pyOpenVDBModule.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b41095bb..5f423176 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- openvdb/python/pyOpenVDBModule.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ openvdb/python/pyOpenVDBModule.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -320,7 +320,11 @@ struct PointIndexConverter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// @return nullptr if the given Python object is not convertible to the PointIndex.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void* convertible(PyObject* obj)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if PY_MAJOR_VERSION >= 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!PyLong_Check(obj)) return nullptr; // not a Python integer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!PyInt_Check(obj)) return nullptr; // not a Python integer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return obj;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -336,8 +340,11 @@ struct PointIndexConverter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Extract the PointIndex from the python integer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PointIndexT* index = static_cast<PointIndexT*>(storage);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if PY_MAJOR_VERSION >= 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *index = static_cast<IntType>(PyLong_AsLong(obj));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *index = static_cast<IntType>(PyInt_AsLong(obj));
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// Register both the PointIndex-to-integer and the integer-to-PointIndex converters.
</span></pre><pre style='margin:0'>
</pre>