<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/02b9bb473e48aa4839af1de795bc53132a1cd79d">https://github.com/macports/macports-ports/commit/02b9bb473e48aa4839af1de795bc53132a1cd79d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 02b9bb4 py-opengl, py-opengl-accelerate: add py37 subport
</span>02b9bb4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 02b9bb473e48aa4839af1de795bc53132a1cd79d
</span>Author: Mark Moll <mmoll@macports.org>
AuthorDate: Tue Jul 31 15:52:23 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-opengl, py-opengl-accelerate: add py37 subport
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The pre-generated *.c files in py-opengl-accelerate don't work with
</span><span style='display:block; white-space:pre;color:#404040;'> python 3.7. They can easily be generated with cython. The patch adds
</span><span style='display:block; white-space:pre;color:#404040;'> files from the repository that are missing from the source
</span><span style='display:block; white-space:pre;color:#404040;'> distribution that are needed for this.
</span>---
python/py-opengl-accelerate/Portfile | 8 ++-
.../files/patch-use-cython.diff | 61 ++++++++++++++++++++++
python/py-opengl/Portfile | 2 +-
3 files changed, 69 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-opengl-accelerate/Portfile b/python/py-opengl-accelerate/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e6225b..2a4be8b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-opengl-accelerate/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-opengl-accelerate/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,15 @@ checksums md5 489338a4818fa63ea54ff3de1b48995c \
</span> rmd160 7d353f43a341fbc34ed580076b8555bae60cc4d5 \
sha256 927f4670b893d46e2f6273ae938bf0a1db27ffae3336eba94813ccef6260c410
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 26 27 33 34 35 36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 26 27 33 34 35 36 37
</span>
if {$subport ne $name} {
depends_lib port:py${python.version}-numpy
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py${python.version}-cython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-use-cython.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete {*}[glob ${worksrcpath}/src/*.c]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type none
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-opengl-accelerate/files/patch-use-cython.diff b/python/py-opengl-accelerate/files/patch-use-cython.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8e4e9c4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-opengl-accelerate/files/patch-use-cython.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,61 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py 2014-06-27 09:47:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2018-07-17 20:31:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # get version from __init__.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-for line in open( os.path.join( HERE,'__init__.py') ):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++for line in open( os.path.join( HERE,'OpenGL_accelerate','__init__.py') ):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if line.startswith( '__version__' ):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version = eval(line.split( '=' )[1].strip())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert version, """Couldn't determine version string!"""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,7 +138,7 @@
</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;'>+ package_dir = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'OpenGL_accelerate':'.',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'OpenGL_accelerate':'OpenGL_accelerate',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ext_modules=extensions,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ **extraArguments
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- OpenGL_accelerate/__init__.py 1969-12-31 18:00:00.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ OpenGL_accelerate/__init__.py 2018-07-17 20:31:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++"""Cython-coded accelerators for the PyOpenGL wrapper
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++This package contains Cython accelerator modules which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++attempt to speed up certain aspects of the PyOpenGL 3.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++wrapper mechanism. The source code is part of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PyOpenGL package and is built via the setupaccel.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++script in the top level of the PyOpenGL source package.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++"""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++__version__ = '3.1.0'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++__version_tuple__ = (3,1,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- OpenGL_accelerate/formathandler.pxd 1969-12-31 18:00:00.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ OpenGL_accelerate/formathandler.pxd 2018-07-17 20:31:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++"""Cython import description for formathandler types"""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cdef class FormatHandler:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdef public int ERROR_ON_COPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdef object c_from_param( self, object instance, object typeCode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdef object c_dataPointer( self, object instance )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdef c_zeros( self, object dims, object typeCode )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdef c_arraySize( self, object instance, object typeCode )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdef c_arrayByteCount( self, object instance )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdef c_arrayToGLType( self, object value )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdef c_asArray( self, object instance, object typeCode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdef c_unitSize( self, object instance, typeCode )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdef c_dimensions( self, object instance)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- OpenGL_accelerate/wrapper.pxd 1969-12-31 18:00:00.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ OpenGL_accelerate/wrapper.pxd 2018-07-17 20:31:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++"""Importable Cython declarations for wrapper module"""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cdef class cArgConverter:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdef object c_call( self, tuple pyArgs, int index, object baseOperation )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cdef class pyArgConverter:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdef object c_call( self, object incoming, object function, tuple arguments )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cdef class cArgumentConverter:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdef object c_call( self, object incoming )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cdef class returnConverter:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdef object c_call( self, object result, object baseOperation, tuple pyArgs, tuple cArgs )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-opengl/Portfile b/python/py-opengl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 513d03c..8d0ec58 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-opengl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-opengl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ checksums md5 0de021941018d46d91e5a8c11c071693 \
</span> rmd160 75728a3b53e62a41e634037c4f00efd4ba1ee67b \
sha256 9b47c5c3a094fa518ca88aeed35ae75834d53e4285512c61879f67a48c94ddaf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 26 27 33 34 35 36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 26 27 33 34 35 36 37
</span>
if {$subport ne $name} {
depends_build port:py${python.version}-setuptools
</pre><pre style='margin:0'>
</pre>