forked from pool/python-pygame
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
This commit is contained in:
Git OBS Bridge
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:46427b2b35060303b06a06a56c07a9e8e55b26cd4c434b792ed78244d2023e05
|
||||
size 5970857
|
||||
3
pygame-2.6.0.tar.gz
Normal file
3
pygame-2.6.0.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0dc751d9dc30ba97fa7077d855c1a945fc3ecffcaa90a3a4f3fe4c2b7db3a36a
|
||||
size 5970025
|
||||
@@ -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()."""
|
||||
@@ -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))
|
||||
|
||||
@@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
|
||||
@@ -18,16 +18,12 @@
|
||||
|
||||
%{?sle15_python_module_pythons}
|
||||
Name: python-pygame
|
||||
Version: 2.5.2
|
||||
Version: 2.6.0
|
||||
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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user