<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/9674404efff7de9f21d7f7c00e0f2d646ca0acb9">https://github.com/macports/macports-ports/commit/9674404efff7de9f21d7f7c00e0f2d646ca0acb9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9674404efff7de9f21d7f7c00e0f2d646ca0acb9
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Tue Dec 21 12:47:58 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> pymol{-devel}: allow for building with latest vtk-m
</span>---
science/pymol/Portfile | 14 +++++++-------
science/pymol/files/patch-vtkm.diff | 2 +-
2 files changed, 8 insertions(+), 8 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 b4ad0140ede..2e0f419c293 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;'>@@ -6,7 +6,7 @@ PortGroup github 1.0
</span> PortGroup boost 1.0
github.setup schrodinger pymol-open-source 2.5.0 v
<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 pymol
conflicts pymol-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,14 +28,14 @@ checksums rmd160 6432d47616aee1e5d9d40cc2a74425b33159d7a0 \
</span> size 10471287
subport pymol-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup schrodinger pymol-open-source 54b187c6aa52a4b42357dc3f9601fc2b51a0a31e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20211215-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup schrodinger pymol-open-source f7048b42758fdc6117646eeffbb51432157ea82e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20211222-[string range ${github.version} 0 7]
</span> conflicts pymol
revision 0
maintainers {reneeotten @reneeotten} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 bbc1e5c5b60afe216c3592c227330c9e4a939f13 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f8261f9b748c1294b6508a9a390fe7c1ef6165cb858a84445ac1c0e9c6cd8643 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10479121
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 995e168b2d350596127d117502ce39b21c6f42a4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8286ae23f164498d0b8054667961550d18fda0ee4b57f315ff1dd9c4102fbb63 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10478989
</span> }
variant python36 conflicts python37 python38 python39 python310 description {Use Python 3.6} {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +64,7 @@ compiler.cxx_standard 2011
</span>
variant vtkm description {Use VTK-m for isosurface generation} {
depends_lib-append port:vtk-m
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append --use-vtkm 1.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append --use-vtkm 1.7
</span> }
depends_lib-append port:freetype \
<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><span style='display:block; white-space:pre;color:#808080;'>index 77ee174a5d3..a9850b322f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/pymol/files/patch-vtkm.diff
</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;'>@@ -9,7 +9,7 @@ index 07d90ffd4..4dbfd7c76 100644
</span> parser.add_argument('--use-openmp', choices=('yes', 'no'),
help="Use OpenMP")
- parser.add_argument('--use-vtkm', choices=('1.5.x', 'master', 'no'),
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ parser.add_argument('--use-vtkm', choices=('1.5', '1.6', 'no'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ parser.add_argument('--use-vtkm', choices=('1.5', '1.6', '1.7', 'no'),
</span> help="Use VTK-m for isosurface generation")
parser.add_argument('--use-msgpackc', choices=('c++11', 'c', 'guess', 'no'),
help="c++11: use msgpack-c header-only library; c: link against "
</pre><pre style='margin:0'>
</pre>