python/python-pygame
SHA256
14
0
Fork 0
forked from pool/python-pygame
Code Pull Requests Activity

Accepting request 951684 from devel:languages:python

Browse Source 
- fix portmidi configuration detection 

- Update to 2.1.2:
  * Fix segfault in display.update by @ankith26 in #2954
  * Quick fix to get 'python -m pygame.docs' working by @ankith26 in #2955
  * Working gamma test on windows by @MyreMylar in #2906
  * Freetype: Fix intermittent crash with test_font_file_not_found by
    @illume in #2944
  * Officially drop python2 (and 3.5) and SDL1 support by @Starbuck5 in #2817
  * Remove most PY2/PY3 C compatibility code by @Starbuck5 in #2819
  * Simple fix to swap numpy.float type out in favour of float by
    @MyreMylar in #2815
  * Remove most SDL1/SDL2 compatibility c code by @Starbuck5 in #2823
  * Ubuntu 18/20 SDL2 sdist CI, mac CI pp36 drop by @ankith26 in #2821
  * SDL1 buildconfig removal by @robertpfeiffer and @illume in #2824 
- Drop support-SDL2-2.0.16.patch.

OBS-URL: https://build.opensuse.org/request/show/951684
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pygame?expand=0&rev=32
This commit is contained in:
Dominique Leuenberger
2022-02-05 22:23:07 +00:00
committed by Git OBS Bridge
parent ae30528862 07dca61bd6
commit 3acf9234a6
5 changed files with 29 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pygame-2.0.1.tar.gz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8b1e7b63f47aafcdd8849933b206778747ef1802bd3d526aca45ed77141e4001
size 5536907

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

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

23
python-pygame.changes
View File

@@ -1,3 +1,26 @@
-------------------------------------------------------------------
Fri Feb 4 23:20:17 UTC 2022 - Dirk Müller <dmueller@suse.com>
- fix portmidi configuration detection
-------------------------------------------------------------------
Wed Jan 5 06:49:40 UTC 2022 - Steve Kowalik <steven.kowalik@suse.com>
- Update to 2.1.2:
* Fix segfault in display.update by @ankith26 in #2954
* Quick fix to get 'python -m pygame.docs' working by @ankith26 in #2955
* Working gamma test on windows by @MyreMylar in #2906
* Freetype: Fix intermittent crash with test_font_file_not_found by
@illume in #2944
* Officially drop python2 (and 3.5) and SDL1 support by @Starbuck5 in #2817
* Remove most PY2/PY3 C compatibility code by @Starbuck5 in #2819
* Simple fix to swap numpy.float type out in favour of float by
@MyreMylar in #2815
* Remove most SDL1/SDL2 compatibility c code by @Starbuck5 in #2823
* Ubuntu 18/20 SDL2 sdist CI, mac CI pp36 drop by @ankith26 in #2821
* SDL1 buildconfig removal by @robertpfeiffer and @illume in #2824
- Drop support-SDL2-2.0.16.patch.
-------------------------------------------------------------------
Thu Sep 16 21:02:06 UTC 2021 - Matej Cepl <mcepl@suse.com>

9
python-pygame.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package python-pygame
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,16 +19,12 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python36 1
Name: python-pygame
Version: 2.0.1
Version: 2.1.2
Release: 0
Summary: A Python Module for Interfacing with the SDL Multimedia Library
License: LGPL-2.1-or-later
Group: Development/Libraries/Python
URL: https://github.com/pygame/pygame
Source0: https://files.pythonhosted.org/packages/source/p/pygame/pygame-%{version}.tar.gz
# PATCH-FIX-UPSTREAM support-SDL2-2.0.16.patch gh#pygame/pygame#2721 mcepl@suse.com
# patch from gh#pygame/pygame#2670
Patch0: support-SDL2-2.0.16.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module numpy}
BuildRequires: %{python_module setuptools}
@@ -105,6 +101,7 @@ chmod a-x docs/licenses/LICENSE.sdl_gfx.txt
%build
export CFLAGS="%{optflags} -fno-strict-aliasing"
export PORTMIDI_INC_PORTTIME=1
%python_build
%install

94
support-SDL2-2.0.16.patch
View File

@@ -1,94 +0,0 @@
From 6b7a8c14f1c20d521d0e15873e1fa7f3679b86f4 Mon Sep 17 00:00:00 2001
From: Starbuck5 <charlie.c.hayden@gmail.com>
Date: Fri, 13 Aug 2021 21:49:39 -0700
Subject: [PATCH 1/3] Move to SDL 2.0.16 for Windows
---
buildconfig/download_win_prebuilt.py | 8 ++++----
test/mixer_test.py | 5 +++--
test/video_test.py | 10 ++++++----
3 files changed, 13 insertions(+), 10 deletions(-)
--- a/buildconfig/download_win_prebuilt.py
+++ b/buildconfig/download_win_prebuilt.py
@@ -64,8 +64,8 @@ def get_urls(x86=True, x64=True, sdl2=Tr
if sdl2:
url_sha1.extend([
[
- 'https://www.libsdl.org/release/SDL2-devel-2.0.14-VC.zip',
- '48d5dcd4a445410301f5575219cffb6de654edb8',
+ 'https://www.libsdl.org/release/SDL2-devel-2.0.16-VC.zip',
+ '13d952c333f3c2ebe9b7bc0075b4ad2f784e7584',
],
[
'https://www.libsdl.org/projects/SDL_image/release/SDL2_image-devel-2.0.5-VC.zip',
@@ -244,12 +244,12 @@ def place_downloaded_prebuilts(temp_dir,
copy(
os.path.join(
temp_dir,
- 'SDL2-devel-2.0.14-VC/SDL2-2.0.14'
+ 'SDL2-devel-2.0.16-VC/SDL2-2.0.16'
),
os.path.join(
move_to_dir,
prebuilt_dir,
- 'SDL2-2.0.14'
+ 'SDL2-2.0.16'
)
)
--- a/test/mixer_test.py
+++ b/test/mixer_test.py
@@ -41,7 +41,8 @@ CONFIGS = [
CONFIG = {"frequency": 22050, "size": -16, "channels": 2} # base config
if pygame.get_sdl_version()[0] >= 2:
- CONFIG = {"frequency": 44100, "size": 32, "channels": 2} # base config
+ # base config
+ CONFIG = {"frequency": 44100, "size": 32, "channels": 2, "allowedchanges": 0}
class InvalidBool(object):
@@ -86,7 +87,7 @@ class MixerModuleTest(unittest.TestCase)
# default values. No way to check buffer size though.
mixer.pre_init(22050, -8, 1) # Non default values
mixer.pre_init(0, 0, 0) # Should reset to default values
- mixer.init()
+ mixer.init(allowedchanges=0)
self.assertEqual(mixer.get_init()[0], 44100)
self.assertEqual(mixer.get_init()[1], -16)
self.assertGreaterEqual(mixer.get_init()[2], 2)
--- a/test/video_test.py
+++ b/test/video_test.py
@@ -1,4 +1,6 @@
import unittest
+import platform
+import sys
import pygame
SDL2 = pygame.get_sdl_version()[0] >= 2
@@ -6,13 +8,14 @@ SDL2 = pygame.get_sdl_version()[0] >= 2
if SDL2:
from pygame._sdl2 import video
-
class VideoModuleTest(unittest.TestCase):
default_caption = "pygame window"
+ @unittest.skipIf((not (sys.maxsize > 2 ** 32)),
+ "32 bit SDL 2.0.16 has an issue.",
+ )
def test_renderer_set_viewport(self):
- """ works.
- """
+ """works."""
window = video.Window(title=self.default_caption, size=(800, 600))
renderer = video.Renderer(window=window)
renderer.logical_size = (1920, 1080)
@@ -20,6 +23,5 @@ if SDL2:
renderer.set_viewport(rect)
self.assertEqual(renderer.get_viewport(), (0, 0, 1920, 1080))
-
if __name__ == "__main__":
unittest.main()