<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/c46e992b59264e4d6df64c0baef4ad250f986d9d">https://github.com/macports/macports-ports/commit/c46e992b59264e4d6df64c0baef4ad250f986d9d</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 c46e992b592 py-opengl: update to 3.1.9
</span>c46e992b592 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit c46e992b59264e4d6df64c0baef4ad250f986d9d
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Jan 20 19:04:50 2025 +1100

<span style='display:block; white-space:pre;color:#404040;'>    py-opengl: update to 3.1.9
</span>---
 python/py-opengl-accelerate/Portfile        | 16 ++++++++--------
 python/py-opengl-accelerate/files/112.patch | 22 ----------------------
 python/py-opengl/Portfile                   | 15 ++++++---------
 python/py-opengl/files/pillow-compat.diff   | 14 +++++++-------
 4 files changed, 21 insertions(+), 46 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 beb0f227e33..41256bc4692 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;'>@@ -2,7 +2,7 @@ PortSystem          1.0
</span> PortGroup           python 1.0
 
 name                py-opengl-accelerate
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             3.1.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             3.1.9
</span> categories-append   graphics
 license             BSD
 maintainers         {jmr @jmroot} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,15 +12,15 @@ long_description \
</span>    operations for slow points in PyOpenGL 3.x.
 
 homepage            http://pyopengl.sourceforge.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.rootname     PyOpenGL-accelerate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.rootname     pyopengl_accelerate
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           md5 927f71d22a29b5488a0aa152875b7c4d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160 1f7ba73656da6117b95ffcb7176f7c37a4ee7af6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256 2b123621273a939f7fd2ec227541e399f9b5d4e815d69ae0bdb1b6c70a293680
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           md5 05d0cca0bb6b09045020783b8cbbcce4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160 45e348afd2329260c44a149b8543f79fd439c625 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256 85957c7c76975818ff759ec9243f9dc7091ef6f373ea37a2eb50c320fd9a86f3
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions     27 39 310 311 312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions     27 39 310 311 312 313
</span> 
 if {$subport ne $name} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib     port:py${python.version}-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles      112.patch
</span><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;'>+    depends_lib-append     port:py${python.version}-numpy
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-opengl-accelerate/files/112.patch b/python/py-opengl-accelerate/files/112.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b5087bc1082..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-opengl-accelerate/files/112.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/mcfletch/pyopengl/pull/112
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/accelerate/src/numpy_formathandler.pyx b/accelerate/src/numpy_formathandler.pyx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0c01d78e..47dacaa0 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/numpy_formathandler.pyx.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/numpy_formathandler.pyx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,8 +21,7 @@ cdef extern from "numpy/arrayobject.h":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     int PyArray_ISCARRAY_RO( np.ndarray instance )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     cdef np.ndarray PyArray_Zeros(int nd, np.Py_intptr_t* dims, np.dtype, int fortran)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     cdef np.ndarray PyArray_EnsureArray(object)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    cdef int PyArray_FillWithScalar(object, object)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    cdef void import_array()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    cdef int PyArray_FillWithScalar(np.ndarray, object)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     cdef void* PyArray_DATA( np.ndarray )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     cdef int PyArray_NDIM( np.ndarray )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     cdef int *PyArray_DIMS( np.ndarray )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -226,4 +225,4 @@ cdef class NumpyHandler(FormatHandler):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Cython numpy tutorial neglects to mention this AFAICS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # get segfaults without it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import_array()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+np.import_array()
</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 5fa87d3db3a..a6d031a3706 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;'>@@ -2,7 +2,7 @@ PortSystem          1.0
</span> PortGroup           python 1.0
 
 name                py-opengl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             3.1.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             3.1.9
</span> categories-append   graphics
 platforms           {darwin any}
 supported_archs     noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,18 +17,15 @@ long_description    PyOpenGL is the cross platform Python binding to OpenGL \
</span> 
 homepage            http://pyopengl.sourceforge.net/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.rootname     PyOpenGL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.rootname     pyopengl
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           md5    aad014a8e6d4d0d4f94a1702de80ba6a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160 5db4b5b82ced7b84ffefc94d2adf26fa12ee0572 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256 eef31a3888e6984fd4d8e6c9961b184c9813ca82604d37fe3da80eb000a76c86
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           md5    f3b334fd5a855e17a644aa1924a9320d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160 2cf0097fb00c608a88298065a22dadd3af991481 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256 28ebd82c5f4491a418aeca9672dffb3adbe7d33b39eada4548a5b4e8c03f60c8
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions     27 39 310 311 312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions     27 39 310 311 312 313
</span> 
 if {$subport ne $name} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${python.version} >= 36} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        python.pep517   yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span>     depends_lib     port:py${python.version}-opengl-accelerate \
                     port:py${python.version}-tkinter
     if {${python.version} >= 30} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-opengl/files/pillow-compat.diff b/python/py-opengl/files/pillow-compat.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a37402ef246..b71705af77e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-opengl/files/pillow-compat.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-opengl/files/pillow-compat.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/test_arraydatatype.py.orig       2019-12-01 07:08:04.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/test_arraydatatype.py    2019-12-07 11:49:55.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,10 +71,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             s = struct.pack( '>iiii', 2,3,4,5 ) * 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             glVertexPointer( 4,GL_INT,0,s )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         def test_texture( self ):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/test_arraydatatype.py.orig       2025-01-20 11:30:48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/test_arraydatatype.py    2025-01-20 18:56:12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,10 +73,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             glVertexPointer(4, GL_INT, 0, s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         def test_texture(self):
</span> -            """Test texture (requires OpenGLContext and PIL)"""
 +            """Test texture (requires OpenGLContext and PIL or Pillow)"""
              try:
                  from OpenGLContext import texture
<span style='display:block; white-space:pre;background:#ffe0e0;'>--                import Image 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                import Image
</span> +                from PIL import Image
                  from OpenGL.GLUT import glutSolidTeapot
              except ImportError:
</pre><pre style='margin:0'>

</pre>