diff --git a/PyOpenGL-3.1.7.tar.gz b/PyOpenGL-3.1.7.tar.gz deleted file mode 100644 index 58a6f57..0000000 --- a/PyOpenGL-3.1.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eef31a3888e6984fd4d8e6c9961b184c9813ca82604d37fe3da80eb000a76c86 -size 1896446 diff --git a/PyOpenGL-pr100-py312.patch b/PyOpenGL-pr100-py312.patch deleted file mode 100644 index 9e55572..0000000 --- a/PyOpenGL-pr100-py312.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b49af26c615236ebc29cf125a8315091482a4a2a Mon Sep 17 00:00:00 2001 -From: Scott Talbert -Date: Tue, 18 Jul 2023 10:12:29 -0400 -Subject: [PATCH] Fix ctypes FormatHandler for Python 3.12+ - -In Python 3.12, CArgObject moved from builtins to _ctypes it seems. - -Fixes #99. ---- - OpenGL/__init__.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/OpenGL/__init__.py b/OpenGL/__init__.py -index f9cc6bfc..77dc8c0b 100644 ---- a/OpenGL/__init__.py -+++ b/OpenGL/__init__.py -@@ -308,7 +308,7 @@ def setPlatform(key): - "ctypesparameter", - "OpenGL.arrays.ctypesparameters.CtypesParameterHandler", - [ -- _bi + ".CArgObject", -+ ("_ctypes" if sys.version_info[:2] >= (3,12) else _bi) + ".CArgObject", - "ctypes.c_uint", - "ctypes.c_int", - "ctypes.c_float", diff --git a/pyopengl-3.1.9.tar.gz b/pyopengl-3.1.9.tar.gz new file mode 100644 index 0000000..c45066d --- /dev/null +++ b/pyopengl-3.1.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28ebd82c5f4491a418aeca9672dffb3adbe7d33b39eada4548a5b4e8c03f60c8 +size 1913642 diff --git a/python-opengl.changes b/python-opengl.changes index 4a57d59..51ea082 100644 --- a/python-opengl.changes +++ b/python-opengl.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Apr 28 15:25:23 UTC 2025 - Markéta Machová + +- update to 3.1.9 + * Reduce the number of iterations in memory leak test to avoid JIT + triggering + * Cleanup formatting in a few modules + * Don't bomb out during egl test when there's no egl devices + * Regenerated C wrappers with latest Cython + * Numpy intp type for latest numpy + * Fix ctypes FormatHandler for Python 3.12+ + * More changes, see upstream commits + ------------------------------------------------------------------- Tue Mar 19 08:55:23 UTC 2024 - Ben Greiner diff --git a/python-opengl.spec b/python-opengl.spec index 79809a2..4ca7bed 100644 --- a/python-opengl.spec +++ b/python-opengl.spec @@ -1,7 +1,7 @@ # # spec file for package python-opengl # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,18 +25,16 @@ %bcond_with test %endif -%define tarname PyOpenGL +%define tarname pyopengl %{?sle15_python_module_pythons} Name: python-opengl%{psuffix} -Version: 3.1.7 +Version: 3.1.9 Release: 0 Summary: OpenGL bindings for Python License: BSD-3-Clause Group: Development/Libraries/Python URL: https://github.com/mcfletch/pyopengl -Source0: https://files.pythonhosted.org/packages/source/P/%{tarname}/%{tarname}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM PyOpenGL-pr100-py312.patch gh#mcfletch/pyopengl#100 -Patch0: PyOpenGL-pr100-py312.patch +Source0: https://files.pythonhosted.org/packages/source/p/%{tarname}/%{tarname}-%{version}.tar.gz BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} @@ -58,6 +56,7 @@ BuildRequires: %{python_module psutil} BuildRequires: %{python_module pygame} BuildRequires: %{python_module pytest-xvfb} BuildRequires: %{python_module pytest} +BuildRequires: %{python_module python-xlib} BuildRequires: Mesa-dri BuildRequires: freeglut-devel BuildRequires: libdrm-devel @@ -66,6 +65,7 @@ BuildRequires: swig BuildRequires: tk-devel BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(osmesa) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb-glx) %endif @@ -93,14 +93,15 @@ sed -e '1{/^#/d}' -i OpenGL/arrays/_buffers.py OpenGL/arrays/buffers.py %if %{with test} %check -%pytest tests +# some tests reported in https://github.com/mcfletch/pyopengl/issues/141 fail in our environment too +%pytest tests -k "not (test_glCallLists_twice2 or test_check_egl_es2 or test_egl_ext_enumerate)" %endif %if !%{with test} %files %{python_files} %license license.txt %{python_sitelib}/OpenGL/ -%{python_sitelib}/PyOpenGL-%{version}.dist-info +%{python_sitelib}/[Pp]y[Oo]pen[Gg][Ll]-%{version}.dist-info %endif %changelog