4 Commits

Author SHA256 Message Date
a3595b4430 Accepting request 1250014 from devel:languages:python
OBS-URL: https://build.opensuse.org/request/show/1250014
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pygame?expand=0&rev=44
2025-03-04 17:33:15 +00:00
c1cf5090e8 Accepting request 1249815 from home:fstegmeier:branches:devel:languages:python
- Update to 2.6.1
  * 2.6.0 -> 2.6.1.dev1 by @illume in #4273
  * grammar-fix by @jakefrombay in #4276
  * Update sprite.rst by @jakefrombay in #4277
  * build(deps): bump actions/checkout from 4.1.6 to 4.1.7 by @dependabot in #4281
  * github: Bump cibuildwheel to v2.19.2 by @illume in #4286
  * Update SpriteIntro.rst by @PavloShutz in #4310
  * buildconfig/appveyor: Python 3.13 for windows by @illume in #4317
  * buildconfig: Pin cython version to range by @illume in #4334
  * build(deps): bump pypa/cibuildwheel from 2.19.2 to 2.20.0 by @dependabot in #4321
  * github/build-*: Fix Cython version specifier by @illume in #4349
  * manylinux: Remove old pypy 3.7 by @illume in #4350

OBS-URL: https://build.opensuse.org/request/show/1249815
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pygame?expand=0&rev=61
2025-03-04 10:18:49 +00:00
42fc1b7535 Accepting request 1200834 from devel:languages:python
OBS-URL: https://build.opensuse.org/request/show/1200834
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pygame?expand=0&rev=43
2024-09-15 10:35:57 +00:00
a591e03e05 Accepting request 1200098 from home:mcalabkova:branches:devel:languages:python
- Update to 2.6.0
  * Inline _PyArg_NoKeywords from Python 3.13 in case it is missing
  * Support collide_mask as collided argument in spritecollide
  * Add display argument to pygame.display.list_modes() and pygame.display.mode_ok()
  * Fix numpy.alltrue imports to import all instead
  * Added generics to abstract group for IDE completion
  * Polygon large coordinate test cases for issue#3989
  * Fix go_over_there example bug in Python 3.12
  * Fix wrong ifdef placement for unix/macos
- Drop merged patches:
  * pygame-pr4236-gcc14.patch
  * pygame-pr4169-videodummytests.patch

OBS-URL: https://build.opensuse.org/request/show/1200098
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pygame?expand=0&rev=59
2024-09-13 12:33:45 +00:00
6 changed files with 38 additions and 100 deletions

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:46427b2b35060303b06a06a56c07a9e8e55b26cd4c434b792ed78244d2023e05
size 5970857

3
pygame-2.6.1.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6a5dd68af93a11ba6eb35c971fa220bf253cebf63b1f54cbe697b30fae9c7c72
size 5970088

View File

@@ -1,53 +0,0 @@
From 656eb5d986873ec7297bd19afeee62f05d16170a Mon Sep 17 00:00:00 2001
From: Emily Trau <emily@downunderctf.com>
Date: Tue, 5 Mar 2024 11:42:09 +1100
Subject: [PATCH] Skip surface tests that fail when `SDL_VIDEODRIVER=dummy`
---
test/surface_test.py | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/test/surface_test.py b/test/surface_test.py
index e6dc1ad095..b1147d278f 100644
--- a/test/surface_test.py
+++ b/test/surface_test.py
@@ -1091,6 +1091,10 @@ def test_image_convert_bug_131(self):
finally:
pygame.display.quit()
+ @unittest.skipIf(
+ os.environ.get("SDL_VIDEODRIVER") == "dummy",
+ 'requires a non-"dummy" SDL_VIDEODRIVER',
+ )
def test_convert_init(self):
"""Ensure initialization exceptions are raised
for surf.convert()."""
@@ -1101,12 +1105,11 @@ def test_convert_init(self):
pygame.display.init()
try:
- if os.environ.get("SDL_VIDEODRIVER") != "dummy":
- try:
- surf.convert(32)
- surf.convert(pygame.Surface((1, 1)))
- except pygame.error:
- self.fail("convert() should not raise an exception here.")
+ try:
+ surf.convert(32)
+ surf.convert(pygame.Surface((1, 1)))
+ except pygame.error:
+ self.fail("convert() should not raise an exception here.")
self.assertRaisesRegex(pygame.error, "No video mode", surf.convert)
@@ -1118,6 +1121,10 @@ def test_convert_init(self):
finally:
pygame.display.quit()
+ @unittest.skipIf(
+ os.environ.get("SDL_VIDEODRIVER") == "dummy",
+ 'requires a non-"dummy" SDL_VIDEODRIVER',
+ )
def test_convert_alpha_init(self):
"""Ensure initialization exceptions are raised
for surf.convert_alpha()."""

View File

@@ -1,38 +0,0 @@
From 504a11fd4855e33ecb945af1270311aa463aae59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Dudfield?= <renesd@gmail.com>
Date: Sun, 19 May 2024 11:12:33 +0200
Subject: [PATCH] pypm: Fix incorrect param in Pm_OpenInput
---
src_c/cython/pygame/pypm.pyx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src_c/cython/pygame/pypm.pyx b/src_c/cython/pygame/pypm.pyx
index f2c16c9e2b..54a88fd83a 100644
--- a/src_c/cython/pygame/pypm.pyx
+++ b/src_c/cython/pygame/pypm.pyx
@@ -106,7 +106,7 @@ cdef extern from "portmidi.h":
PmDeviceID inputDevice,
void *inputDriverInfo,
long bufferSize,
- long (*PmPtr) (), # long = PtTimestamp
+ PmTimeProcPtr time_proc, # long = PtTimestamp
void *time_info)
PmError Pm_OpenOutput(PortMidiStream** stream,
@@ -538,11 +538,14 @@ cdef class Input:
"""Instantiate MIDI input stream object."""
cdef PmError err
+ cdef PmTimeProcPtr PmPtr
self.device = input_device
self.debug = 0
+ PmPtr = <PmTimeProcPtr>&Pt_Time
+
err = Pm_OpenInput(&(self.midi), input_device, NULL, buffersize,
- &Pt_Time, NULL)
+ PmPtr, NULL)
if err < 0:
raise Exception(Pm_GetErrorText(err))

View File

@@ -1,3 +1,35 @@
-------------------------------------------------------------------
Mon Mar 3 12:31:38 UTC 2025 - Felix Stegmeier <felix.stegmeier@suse.com>
- Update to 2.6.1
* 2.6.0 -> 2.6.1.dev1 by @illume in #4273
* grammar-fix by @jakefrombay in #4276
* Update sprite.rst by @jakefrombay in #4277
* build(deps): bump actions/checkout from 4.1.6 to 4.1.7 by @dependabot in #4281
* github: Bump cibuildwheel to v2.19.2 by @illume in #4286
* Update SpriteIntro.rst by @PavloShutz in #4310
* buildconfig/appveyor: Python 3.13 for windows by @illume in #4317
* buildconfig: Pin cython version to range by @illume in #4334
* build(deps): bump pypa/cibuildwheel from 2.19.2 to 2.20.0 by @dependabot in #4321
* github/build-*: Fix Cython version specifier by @illume in #4349
* manylinux: Remove old pypy 3.7 by @illume in #4350
-------------------------------------------------------------------
Wed Sep 11 08:45:21 UTC 2024 - Markéta Machová <mmachova@suse.com>
- Update to 2.6.0
* Inline _PyArg_NoKeywords from Python 3.13 in case it is missing
* Support collide_mask as collided argument in spritecollide
* Add display argument to pygame.display.list_modes() and pygame.display.mode_ok()
* Fix numpy.alltrue imports to import all instead
* Added generics to abstract group for IDE completion
* Polygon large coordinate test cases for issue#3989
* Fix go_over_there example bug in Python 3.12
* Fix wrong ifdef placement for unix/macos
- Drop merged patches:
* pygame-pr4236-gcc14.patch
* pygame-pr4169-videodummytests.patch
-------------------------------------------------------------------
Wed May 29 07:56:43 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>

View File

@@ -1,7 +1,7 @@
#
# spec file for package python-pygame
#
# 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
@@ -18,16 +18,12 @@
%{?sle15_python_module_pythons}
Name: python-pygame
Version: 2.5.2
Version: 2.6.1
Release: 0
Summary: A Python Module for Interfacing with the SDL Multimedia Library
License: Apache-2.0 AND LGPL-2.1-or-later AND BSD-2-Clause AND BSD-3-Clause AND libpng-2.0
URL: https://github.com/pygame/pygame
Source0: %{url}/archive/%{version}.tar.gz#/pygame-%{version}.tar.gz
# PATCH-FIX-UPSTREAM pygame-pr4169-videodummytests.patch gh#pygame/pygame#4169
Patch0: pygame-pr4169-videodummytests.patch
# PATCH-FIX-UPSTREAM pygame-pr4236-gcc14.patch gh#pygame/pygame#4236
Patch1: pygame-pr4236-gcc14.patch
BuildRequires: %{python_module Cython}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module numpy}
@@ -131,6 +127,7 @@ rm %{buildroot}%{_docdir}/%{name}-doc/examples/.editorconfig
export SDL_VIDEODRIVER=dummy
export SDL_AUDIODRIVER=disk
export LANG=en_US.UTF-8
export PYGAME_MSYS2=1
%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch}
$python -m pygame.tests.__main__ -v --exclude opengl --time_out 300
}