<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[141705] trunk/dports/python/py-mayavi</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/141705">141705</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-10-26 14:48:56 -0700 (Mon, 26 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-mayavi: update to 4.4.3 and fix build failure with vtk 6.3 (#48867; maintainer)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpymayaviPortfile">trunk/dports/python/py-mayavi/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/python/py-mayavi/files/</li>
<li><a href="#trunkdportspythonpymayavifilesmayaviPR247diff">trunk/dports/python/py-mayavi/files/mayaviPR-247.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpymayaviPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-mayavi/Portfile (141704 => 141705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-mayavi/Portfile 2015-10-26 21:47:18 UTC (rev 141704)
+++ trunk/dports/python/py-mayavi/Portfile 2015-10-26 21:48:56 UTC (rev 141705)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> PortGroup active_variants 1.1
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx">
</span><del>-github.setup enthought mayavi 4.4.2
</del><ins>+github.setup enthought mayavi 4.4.3
</ins><span class="cx">
</span><span class="cx"> name py-mayavi
</span><span class="cx"> categories-append devel graphics math
</span><span class="lines">@@ -18,12 +18,15 @@
</span><span class="cx"> license BSD
</span><span class="cx"> platforms darwin
</span><span class="cx">
</span><del>-checksums rmd160 3989bde25482efa0ef981c76fc8aa54eae6a8a23 \
- sha256 5498bb194c197a432a3d3b16eeac84ea88c8b37358b621b50c880a44b2a3a168
</del><ins>+checksums rmd160 018c6fba74f1cb4809a9f65610e44626536525af \
+ sha256 37baa7cf539886be8cb0d8cccb66704ee85e7d5570962ad07caf69de30d76e8d
</ins><span class="cx">
</span><span class="cx"> python.versions 27
</span><span class="cx">
</span><span class="cx"> if {${name} ne ${subport}} {
</span><ins>+ patchfiles mayaviPR-247.diff
+ patch.pre_args -p1
+
</ins><span class="cx"> depends_build-append port:py${python.version}-setuptools \
</span><span class="cx"> port:py${python.version}-sphinx
</span><span class="cx"> depends_lib-append port:py${python.version}-apptools \
</span></span></pre></div>
<a id="trunkdportspythonpymayavifilesmayaviPR247diff"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-mayavi/files/mayaviPR-247.diff (0 => 141705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-mayavi/files/mayaviPR-247.diff (rev 0)
+++ trunk/dports/python/py-mayavi/files/mayaviPR-247.diff 2015-10-26 21:48:56 UTC (rev 141705)
</span><span class="lines">@@ -0,0 +1,92 @@
</span><ins>+diff --git a/mayavi/tests/test_glyph.py b/mayavi/tests/test_glyph.py
+index 5f15cea..50e5177 100644
+--- a/mayavi/tests/test_glyph.py
++++ b/mayavi/tests/test_glyph.py
+@@ -140,10 +140,6 @@ def test_glyph(self):
+ def test_mask_input_points_with_random_mode(self):
+ """Test if masking input points works with random mode.
+ Tests Issue #165"""
+- s = self.scene
+- src = s.children[0]
+- g = src.children[0].children[1]
+- g.glyph.mask_input_points = True
+ self.check(mask=True, mask_random_mode=True)
+
+ def test_mask_input_points_without_random_mode(self):
+diff --git a/tvtk/common.py b/tvtk/common.py
+index 0c82372..fb04270 100644
+--- a/tvtk/common.py
++++ b/tvtk/common.py
+@@ -47,8 +47,8 @@ def get_tvtk_name(vtk_name):
+ def is_old_pipeline():
+ return vtk_major_version < 6
+
+-def is_version_62():
+- return vtk_major_version == 6 and vtk_minor_version == 2
++def is_version_62_or_later():
++ return vtk_major_version == 6 and vtk_minor_version > 1
+
+ def is_version_58():
+ return vtk_major_version == 5 and vtk_minor_version == 8
+diff --git a/tvtk/tests/test_vtk_parser.py b/tvtk/tests/test_vtk_parser.py
+index 28a8c4d..27537dd 100644
+--- a/tvtk/tests/test_vtk_parser.py
++++ b/tvtk/tests/test_vtk_parser.py
+@@ -94,10 +94,10 @@ def test_parse(self):
+ 'DiffuseColor': ((1.0, 1.0, 1.0), None),
+ 'EdgeColor': ((1.0, 1.0, 1.0), None),
+ 'LineStipplePattern': (65535, None),
+- 'LineStippleRepeatFactor': (1, (1, vtk.VTK_LARGE_INTEGER)),
+- 'LineWidth': (1.0, (0.0, vtk.VTK_LARGE_FLOAT)),
++ 'LineStippleRepeatFactor': (1, (1, vtk.VTK_INT_MAX)),
++ 'LineWidth': (1.0, (0.0, vtk.VTK_FLOAT_MAX)),
+ 'Opacity': (1.0, (0.0, 1.0)),
+- 'PointSize': (1.0, (0.0, vtk.VTK_LARGE_FLOAT)),
++ 'PointSize': (1.0, (0.0, vtk.VTK_FLOAT_MAX)),
+ 'ReferenceCount': (1, None),
+ 'Specular': (0.0, (0.0, 1.0)),
+ 'SpecularColor': ((1.0, 1.0, 1.0), None),
+@@ -140,7 +140,7 @@ def test_parse(self):
+ res = ['AddShaderVariable', 'BackfaceRender', 'DeepCopy',
+ 'ReleaseGraphicsResources', 'RemoveAllTextures',
+ 'RemoveTexture', 'Render']
+- if vtk_minor_version == 2:
++ if vtk_minor_version > 1:
+ res.append('VTKTextureUnit')
+ else:
+ res = ['AddShaderVariable', 'BackfaceRender', 'DeepCopy',
+diff --git a/tvtk/vtk_parser.py b/tvtk/vtk_parser.py
+index 0ffec78..8800f07 100644
+--- a/tvtk/vtk_parser.py
++++ b/tvtk/vtk_parser.py
+@@ -12,7 +12,7 @@
+ # Local imports (these are relative imports for a good reason).
+ import class_tree
+ import vtk_module as vtk
+-from common import is_version_62
++from common import is_version_62_or_later
+
+ class VTKMethodParser:
+ """This class provides useful methods for parsing methods of a VTK
+@@ -301,7 +301,7 @@ def get_method_signature(self, method):
+
+ """
+ # VTK 6.2 false built in funcs/methods are ignored
+- if is_version_62():
++ if is_version_62_or_later():
+ built_in_func = isinstance(method, types.BuiltinFunctionType)
+ built_in_meth = isinstance(method, types.BuiltinMethodType)
+ if not (built_in_func or built_in_meth):
+diff --git a/tvtk/wrapper_gen.py b/tvtk/wrapper_gen.py
+index 277ed1d..3506135 100644
+--- a/tvtk/wrapper_gen.py
++++ b/tvtk/wrapper_gen.py
+@@ -16,7 +16,7 @@
+
+ # Local imports (these are relative imports because the package is not
+ # installed when these modules are imported).
+-from common import get_tvtk_name, camel2enthought, is_version_62, is_version_58
++from common import get_tvtk_name, camel2enthought, is_version_58
+ import vtk_parser
+ import indenter
+ import special_gen
</ins></span></pre>
</div>
</div>
</body>
</html>