python-pyopengl-accelerate: update to 3.1.9

mingw-w64-python-pyopengl-accelerate/PKGBUILD

@@ -4,15 +4,16 @@ _realname=pyopengl-accelerate
 _pyname=PyOpenGL-accelerate
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=3.1.8
+pkgver=3.1.9
 pkgrel=1
 pkgdesc="Acceleration code for PyOpenGL (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://mcfletch.github.io/pyopengl/'
+msys2_repository_url="https://github.com/mcfletch/pyopengl"
 msys2_references=(
   'pypi: PyOpenGL-accelerate'
 )
-url='https://pyopengl.sourceforge.io/'
 license=('spdx:BSD-3-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-python-pyopengl")
@@ -22,40 +23,20 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python-build"
              "${MINGW_PACKAGE_PREFIX}-cython"
              "${MINGW_PACKAGE_PREFIX}-cc")
 options=(!strip)
-source=("https://github.com/mcfletch/pyopengl/archive/refs/tags/release-${pkgver}.tar.gz"
-	"pyopengl-version.patch"
-	"pyopengl-array.patch"
-)
-sha256sums=('78f4016f13705d66dc89d5d046eee660c2f5f0915e5ecfeeed79dffac741bc97'
-            'f88697750e5cfe6d685094895f62e64ac4a768a36d0aa9eec5c6fd6199e93651'
-            '8a41eeb11a59f69bd4097ae2daab37d68d845bfd496ca0929ff437d061b7e52f'
-)
-
-prepare() {
-  cd "${srcdir}"
-  rm -rf python-build-${MSYSTEM} | true
-  cp -r "pyopengl-release-${pkgver}" "python-build-${MSYSTEM}"
-  cd "python-build-${MSYSTEM}"
-  patch -Np1 -i ../pyopengl-version.patch
-  patch -Np1 -i ../pyopengl-array.patch
-}
+source=("https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_realname/-/_}-${pkgver}.tar.gz")
+sha256sums=('85957c7c76975818ff759ec9243f9dc7091ef6f373ea37a2eb50c320fd9a86f3')
 
 build() {
-  cd "${srcdir}/python-build-${MSYSTEM}/accelerate"
+  cp -r "${_realname/-/_}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation
 }
 
-check() {
-  # skipped as the checks fail for no good reason
-  true
-}
-
 package() {
-  cd "${srcdir}/python-build-${MSYSTEM}/accelerate"
+  cd "${srcdir}/python-build-${MSYSTEM}"
+
   MSYS2_ARG_CONV_EXCL="--prefix=" \
     "${MINGW_PREFIX}"/bin/python -m installer --prefix=${MINGW_PREFIX} \
     --destdir="${pkgdir}" dist/*.whl
 
-  cd "${srcdir}/python-build-${MSYSTEM}"
   install -Dm644 license.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }

mingw-w64-python-pyopengl-accelerate/pyopengl-array.patch

@@ -1,54 +0,0 @@
-From fbe0fab7947788039cb4fbc9a5a1ea65a0c0e15b Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Fri, 5 Jan 2024 08:48:12 +0100
-Subject: [PATCH 1/2] accelerate: Fix type of PyArray_FillWithScalar
-
-The first argument is of type PyArrayObject, not PyObject.
----
- accelerate/src/numpy_formathandler.pyx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/accelerate/src/numpy_formathandler.pyx b/accelerate/src/numpy_formathandler.pyx
-index 0c01d78e..10813694 100644
---- a/accelerate/src/numpy_formathandler.pyx
-+++ b/accelerate/src/numpy_formathandler.pyx
-@@ -21,7 +21,7 @@ cdef extern from "numpy/arrayobject.h":
-     int PyArray_ISCARRAY_RO( np.ndarray instance )
-     cdef np.ndarray PyArray_Zeros(int nd, np.Py_intptr_t* dims, np.dtype, int fortran)
-     cdef np.ndarray PyArray_EnsureArray(object)
--    cdef int PyArray_FillWithScalar(object, object)
-+    cdef int PyArray_FillWithScalar(np.ndarray, object)
-     cdef void import_array()
-     cdef void* PyArray_DATA( np.ndarray )
-     cdef int PyArray_NDIM( np.ndarray )
-
-From f62dd58a5437c628d3ff3e626d4507811ef2127b Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Fri, 5 Jan 2024 08:48:43 +0100
-Subject: [PATCH 2/2] accelerate: Use recommended way to integrate NumPy with
- Cython
-
-This approach follows
-<https://cython.readthedocs.io/en/latest/src/tutorial/numpy.html#adding-types>.
----
- accelerate/src/numpy_formathandler.pyx | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/accelerate/src/numpy_formathandler.pyx b/accelerate/src/numpy_formathandler.pyx
-index 10813694..47dacaa0 100644
---- a/accelerate/src/numpy_formathandler.pyx
-+++ b/accelerate/src/numpy_formathandler.pyx
-@@ -22,7 +22,6 @@ cdef extern from "numpy/arrayobject.h":
-     cdef np.ndarray PyArray_Zeros(int nd, np.Py_intptr_t* dims, np.dtype, int fortran)
-     cdef np.ndarray PyArray_EnsureArray(object)
-     cdef int PyArray_FillWithScalar(np.ndarray, object)
--    cdef void import_array()
-     cdef void* PyArray_DATA( np.ndarray )
-     cdef int PyArray_NDIM( np.ndarray )
-     cdef int *PyArray_DIMS( np.ndarray )
-@@ -226,4 +225,4 @@ cdef class NumpyHandler(FormatHandler):
- 
- # Cython numpy tutorial neglects to mention this AFAICS
- # get segfaults without it
--import_array()
-+np.import_array()

mingw-w64-python-pyopengl-accelerate/pyopengl-version.patch

@@ -1,10 +0,0 @@
---- a/accelerate/OpenGL_accelerate/__init__.py	2024-11-10 00:15:51.762734061 +0700
-+++ b/accelerate/OpenGL_accelerate/__init__.py	2024-11-10 00:15:58.159686979 +0700
-@@ -6,5 +6,5 @@
- PyOpenGL package and is built via the setupaccel.py
- script in the top level of the PyOpenGL source package.
- """
--__version__ = "3.1.7"
--__version_tuple__ = (3, 1, 7)
-+__version__ = "3.1.8"
-+__version_tuple__ = (3, 1, 8)