From 57db7355d03b917599e7edcedcac76522a59c969150ebe86cec5c90234f9080a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Wed, 11 Sep 2024 07:53:49 +0000 Subject: [PATCH] Accepting request 1199876 from home:mcalabkova:branches:devel:languages:python - Add upstream patch numpy2.patch to fix compatibility with Numpy 2 * https://github.com/mcfletch/pyopengl/commit/f897b0ed75c00d4c524be4689683a334832217ac OBS-URL: https://build.opensuse.org/request/show/1199876 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-opengl-accelerate?expand=0&rev=27 --- numpy2.patch | 22 ++++++++++++++++++++++ python-opengl-accelerate.changes | 6 ++++++ python-opengl-accelerate.spec | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 numpy2.patch diff --git a/numpy2.patch b/numpy2.patch new file mode 100644 index 0000000..35db35f --- /dev/null +++ b/numpy2.patch @@ -0,0 +1,22 @@ +From f897b0ed75c00d4c524be4689683a334832217ac Mon Sep 17 00:00:00 2001 +From: "Mike C. Fletcher" +Date: Mon, 1 Jul 2024 11:33:37 -0400 +Subject: [PATCH] BUGFIX Numpy intp type for latest numpy + +--- + 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 47ed919b..ae5c7bfa 100644 +--- a/accelerate/src/numpy_formathandler.pyx ++++ b/accelerate/src/numpy_formathandler.pyx +@@ -20,7 +20,7 @@ cdef extern from "numpy/arrayobject.h": + int NPY_ARRAY_FORCECAST + int PyArray_ISCARRAY( np.ndarray instance ) + 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_Zeros(int nd, np.npy_intp* dims, np.dtype, int fortran) + cdef np.ndarray PyArray_EnsureArray(object) + cdef int PyArray_FillWithScalar(np.ndarray, object) + cdef void* PyArray_DATA( np.ndarray ) diff --git a/python-opengl-accelerate.changes b/python-opengl-accelerate.changes index 4e23721..f7e199c 100644 --- a/python-opengl-accelerate.changes +++ b/python-opengl-accelerate.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 10 12:33:04 UTC 2024 - Markéta Machová + +- Add upstream patch numpy2.patch to fix compatibility with Numpy 2 + * https://github.com/mcfletch/pyopengl/commit/f897b0ed75c00d4c524be4689683a334832217ac + ------------------------------------------------------------------- Wed Jun 5 14:28:18 UTC 2024 - John Paul Adrian Glaubitz diff --git a/python-opengl-accelerate.spec b/python-opengl-accelerate.spec index 7ccba04..8154633 100644 --- a/python-opengl-accelerate.spec +++ b/python-opengl-accelerate.spec @@ -29,6 +29,8 @@ URL: http://pyopengl.sourceforge.net Source0: %{tarname}-%{_version}.tar.gz # PATCH-FIX-UPSTREAM - accelerate: Fix C type errors for GCC 14/Clang compatibility Patch0: https://github.com/mcfletch/pyopengl/pull/112.patch +# PATCH-FIX-UPSTREAM https://github.com/mcfletch/pyopengl/commit/f897b0ed75c00d4c524be4689683a334832217ac BUGFIX Numpy intp type for latest numpy +Patch1: numpy2.patch BuildRequires: %{python_module Cython} BuildRequires: %{python_module devel} BuildRequires: %{python_module opengl >= %{version}}