<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cdeb8f5f792c99484703cd7492313fa1f89e5e88">https://github.com/macports/macports-ports/commit/cdeb8f5f792c99484703cd7492313fa1f89e5e88</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cdeb8f5f792c99484703cd7492313fa1f89e5e88
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Thu Dec 9 12:25:54 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> pymol: fix vtkm variant
</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/64123
</span>---
science/pymol/Portfile | 7 ++++--
science/pymol/files/patch-vtkm.diff | 43 +++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/pymol/Portfile b/science/pymol/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b3cac289f82..5c108db2486 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/pymol/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/pymol/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,10 +84,13 @@ patchfiles pymol_shell.diff \
</span> setup.py.diff \
patch-boost-include.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix for build on 10.13 and below, can be removed upon next update
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# two fixes for PyMOL v2.5.0 (can be removed upon next update):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 1. fix for build on 10.13 and below;
</span> # see: https://github.com/schrodinger/pymol-open-source/issues/193
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# 2. fix for build with VTK-M 1.6
</span> if {${subport} != "pymol-devel"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-layer1_Wizard.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-layer1_Wizard.cpp.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-vtkm.diff
</span> }
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/pymol/files/patch-vtkm.diff b/science/pymol/files/patch-vtkm.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..77ee174a5d3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/pymol/files/patch-vtkm.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with vtk-m 1.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://github.com/schrodinger/pymol-open-source/commit/5a6d65e8a5102fc71bcb5ac714e62884fca50505
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/setup.py b/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 07d90ffd4..4dbfd7c76 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,7 +46,7 @@ class options:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ help="skip libxml2 dependency, disables COLLADA export")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parser.add_argument('--use-openmp', choices=('yes', 'no'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ help="Use OpenMP")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- parser.add_argument('--use-vtkm', choices=('1.5.x', 'master', 'no'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ parser.add_argument('--use-vtkm', choices=('1.5', '1.6', 'no'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ help="Use VTK-m for isosurface generation")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parser.add_argument('--use-msgpackc', choices=('c++11', 'c', 'guess', 'no'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ help="c++11: use msgpack-c header-only library; c: link against "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -421,7 +421,7 @@ def make_launch_script(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if options.use_vtkm != "no":
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for prefix in prefix_path:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vtkm_inc_dir = os.path.join(prefix, "include", "vtkm-1.5")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vtkm_inc_dir = os.path.join(prefix, "include", f"vtkm-{options.use_vtkm}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if os.path.exists(vtkm_inc_dir):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -434,14 +434,14 @@ def make_launch_script(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vtkm_inc_dir,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vtkm_inc_dir + "/vtkm/thirdparty/diy/vtkmdiy/include",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vtkm_inc_dir + "/vtkm/thirdparty/lcl/vtkmlcl",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ] + (options.use_vtkm != "master") * [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ] + (options.use_vtkm == "1.5") * [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vtkm_inc_dir + "/vtkm/thirdparty/diy",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vtkm_inc_dir + "/vtkm/thirdparty/taotuple",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libs += [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "vtkm_cont-1.5",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "vtkm_filter_contour-1.5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if options.use_vtkm == "master" else "vtkm_filter-1.5",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ f"vtkm_cont-{options.use_vtkm}",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ f"vtkm_filter-{options.use_vtkm}" if options.use_vtkm == "1.5" else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ f"vtkm_filter_contour-{options.use_vtkm}",
</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 options.vmd_plugins:
</span></pre><pre style='margin:0'>
</pre>