Accepting request 888765 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/888765 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pygame?expand=0&rev=30
2021-04-27 19:34:19 +00:00
parent 2c766b9ec6 f4bea99d0c
commit 5dd934bfb8
6 changed files with 113 additions and 67 deletions
--- a/pygame-1.9.6.tar.gz
+++ b/pygame-1.9.6.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:301c6428c0880ecd4a9e3951b80e539c33863b6ff356a443db1758de4f297957
-size 3223131
--- a/pygame-2.0.1.tar.gz
+++ b/pygame-2.0.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8b1e7b63f47aafcdd8849933b206778747ef1802bd3d526aca45ed77141e4001
+size 5536907
--- a/python-pygame-python38-import.patch
+++ b/python-pygame-python38-import.patch
@@ -1,22 +0,0 @@
-From 9b5f88bca562f37d30eb7ac0f8f4ebdda68cb494 Mon Sep 17 00:00:00 2001
-From: Christoph Gohlke <cjgohlke@gmail.com>
-Date: Wed, 14 Aug 2019 14:01:06 -0700
-Subject: [PATCH] Fix test error on Python 3.8.0b3
-
-Fix `ImportError: cannot import name 'clock' from 'time' (unknown location)`
---
- test/math_test.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/test/math_test.py b/test/math_test.py
-index c0bb84eb3..f22ba5e12 100644
--- a/test/math_test.py
-+++ b/test/math_test.py
-@@ -2,7 +2,6 @@
- import sys
- import unittest
- import math
-from time import clock
- import platform
- 
- import pygame.math
--- a/python-pygame-test-no-mp3.patch
+++ b/python-pygame-test-no-mp3.patch
@@ -1,13 +0,0 @@
-Index: pygame-1.9.6/test/mixer_music_test.py
-===================================================================
--- pygame-1.9.6.orig/test/mixer_music_test.py	2019-04-25 08:14:48.000000000 +0200
-+++ pygame-1.9.6/test/mixer_music_test.py	2019-05-20 10:36:59.969907416 +0200
-@@ -33,7 +33,7 @@ class MixerMusicModuleTest(unittest.Test
-           # Load a music file for playback
- 
-         data_fname = example_path('data')
-        formats = ['mp3', 'ogg', 'wav']
-+        formats = ['ogg', 'wav']
- 
-         for f in formats:
-             path = os.path.join(data_fname, 'house_lo.%s' % f)
--- a/python-pygame.changes
+++ b/python-pygame.changes
@@ -1,3 +1,85 @@
+-------------------------------------------------------------------
+Tue Apr 27 11:22:12 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Explictly require libudev while building (for staging)
+
+-------------------------------------------------------------------
+Tue Mar 23 20:56:42 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Update to 2.0.1 The Age Of Aquarius release
+  * This is a bug fix release, with a bunch of features and
+    optimizations thrown in for good measure.
+  * Backwards compatibility fixes
+  * Major event refactor
+  * Color.update() and Rect.update()
+  * SDL 2.0.14
+  * Xbox One port
+  * pathlib support for image, sound, and font loading.
+  * Cursor object API
+  * pygame.draw.rect fixes.
+- pygame 2.0 - the happy dance birthday release
+  * Support for Metal, Direct 3d, Vulkan, OpenGL 3.0+ in various
+    profiles (core, compatibility, debug, robust, etc), OpenGL ES,
+    and other modern hardware accelerated video APIs across many
+    platforms.
+  * SSE2/Neon assembly image drawing. Much faster drawing
+    routines, image loading, and alpha blending.
+  * Type Hints, for code completion (and to help you make the
+    squiggly lines disappear) in editors and IDEs.
+  * Code cleanup, using lots of code robustness tools like static
+    analyzers, and automated CI/CD. We've been able to help dozens
+    of people new to community projects contribute. We have lots
+    of work to go on code quality, but we're currently the highest
+    rated Python and highest rate C large project on LGTM.
+  * Many, many bug fixes including in our pygame.draw routines,
+    pygame.math(for vectors), and pygame.mask for pixel perfect
+    collision detection.
+  * better support for PyPy (the fast JIT based implementation of
+    python). See our milestone Are we pypy yet? No. for our
+    progress on making PyPy the best python for games.
+  * libsdl version 2 support. Technically pygame 2.0 still works
+    with SDL 1, but we recommend SDL2 which is vastly improved
+    over SDL1 for most use cases. Probably we will remove SDL 1
+    support starting pygame 2.1.
+  * Touch support (multitouch, gestures, etc)
+  * Audio input support (make games with your microphone!).
+  * Message alert boxes (Press OK, or Cancel).
+  * Better keyboard support. Proper unicode input and IME support.
+  * Much improved game controller support.
+  * Better image and audio format support. Including: webp, 32bit
+    wav files, and much more reliable mp3 support.
+  * Multiple display support, and multiple window support (multi
+    window support is still experimental, more will come in pygame
+    2.1).
+  * Android support through python for android (fork of pygame
+    subset for android). Better documentation, and better support
+    will come in future releases.
+  * to make distributing your apps easier, a built in "pyinstaller
+    hook"and compatibility with cxfreeze.
+  * binary "wheels" on many platforms and versions of python from
+    the old python 2.7 - to the latest python 3.9 (and with pypy!).
+  * lots of quality of life improvements like Surface.fill
+    ('black') instead of Surface.fill(pygame.Color(0, 0, 0)). Also
+    keywords are supported for many more function arguments. You
+    can draw rounded corners on rects.
+  * plenty of new examples, like python3 -m pygame.examples.
+    font_viewer, and python3 -m pygame.examples.music_drop_fade.
+    Additionally the example source code has been cleaned up a lot
+    to follow a more current python style.
+  * Hundreds of documentation improvements, include a new Korean
+    tutorial.
+  * a special SCALED mode which takes low pixel games and
+    automatically translates them to a larger window. Imagine your
+    320x200 resolution game of glorious pixel art... on modern
+    screens that would be a very tiny windows. Now with SCALED it
+    shows up big on a Full HD screen, or even a 4K/8K screen and
+    the translation of mouse coordinates and up-scaling of pixels
+    is done for you (hardware accelerated of course).
+- Full release notes on https://github.com/pygame/pygame/releases
+- Skip python36 build. python36-numpy is not available on TW.
+- Drop python-pygame-test-no-mp3.patch and
+  python-pygame-python38-import.patch
+
 ------------------------------------------------------------------
 Tue Oct 15 04:11:07 UTC 2019 - Steve Kowalik <steven.kowalik@suse.com>

--- a/python-pygame.spec
+++ b/python-pygame.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pygame
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,28 +12,28 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #


 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define skip_python36 1
 Name:           python-pygame
-Version:        1.9.6
+Version:        2.0.1
 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
+URL:            https://github.com/pygame/pygame
 Source0:        https://files.pythonhosted.org/packages/source/p/pygame/pygame-%{version}.tar.gz
-# Do not test mp3 format; whe have that support disabled in SDL1
-Patch0:         python-pygame-test-no-mp3.patch
-Patch1:         python-pygame-python38-import.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module numpy}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  bitstream-vera-fonts
 BuildRequires:  fdupes
 BuildRequires:  fontconfig
 BuildRequires:  libtiff-devel
+BuildRequires:  libudev-devel
 BuildRequires:  libv4l-devel >= 0.8.4
 BuildRequires:  pkgconfig
 BuildRequires:  portmidi-devel
@@ -46,13 +46,13 @@ BuildRequires:  xorg-x11-fonts-75dpi
 BuildRequires:  xorg-x11-fonts-core
 BuildRequires:  xorg-x11-fonts-cyrillic
 BuildRequires:  config(fluid-soundfont-gm)
-BuildRequires:  pkgconfig(SDL_image)
-BuildRequires:  pkgconfig(SDL_mixer)
-BuildRequires:  pkgconfig(SDL_ttf)
+BuildRequires:  pkgconfig(SDL2_image)
+BuildRequires:  pkgconfig(SDL2_mixer)
+BuildRequires:  pkgconfig(SDL2_ttf)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libpng)
-BuildRequires:  pkgconfig(sdl)
+BuildRequires:  pkgconfig(sdl2)
 BuildRequires:  pkgconfig(x11)
 Requires:       fontconfig
 Requires:       python-numpy
@@ -93,10 +93,11 @@ This package contains documentation and example programs for Pygame.
 %autopatch -p1
 sed -i 's/\r$//' docs/reST/ref/code_examples/draw_module_example.py
 sed -i 's/\r$//' docs/reST/ref/code_examples/joystick_calls.py
+sed -i 's/\r$//' docs/licenses/LICENSE*.txt
 # Fix wrong-script-interpreter
-find examples -name '*.py' -exec sed -i "s|^#!%{_bindir}/env python$|#!%{_bindir}/python3|" {} \;
-find examples -name '*.py' -exec sed -i "s|^#! %{_bindir}/env python$|#!%{_bindir}/python3|" {} \;
+find examples -name '*.py' -exec sed -i "s|^#!.*env python.*$|#!%{_bindir}/python3|" {} \;
 chmod a+x examples/*.py
+chmod a-x docs/licenses/LICENSE.sdl_gfx.txt

 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing"
@@ -106,20 +107,19 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
 export CFLAGS="%{optflags} -fno-strict-aliasing"
 %python_install
 %{python_expand pushd %{buildroot}%{$python_sitearch}
-sed -i "s|^#!%{_bindir}/env python$|#!%{_bindir}/python3|" pygame/tests/test_utils/png.py
+sed -i "s|^#!.*env python.*$|#!%{_bindir}/$python|" pygame/tests/test_utils/png.py
 chmod a+x pygame/tests/test_utils/png.py
-chmod a+x pygame/examples/macosx/aliens_app_example/aliens.py
 chmod a+x pygame/examples/*.py
 chmod a-x pygame/examples/__init__.py
-chmod a-x pygame/examples/prevent_display_stretching.py
-chmod a-x pygame/examples/freetype_misc.py
-$python -m compileall -d %{$python_sitearch} pygame/tests/test_utils/
-$python -O -m compileall -d %{$python_sitearch} pygame/tests/test_utils/
-%fdupes %{buildroot}%{$python_sitearch}
 popd
 }
-%fdupes docs
-%fdupes examples
+%python_compileall
+%python_expand %fdupes %{buildroot}%{$python_sitearch}
+# install docs and examples for doc package and deduplicate
+mkdir -p %{buildroot}%{_docdir}/%{name}-doc
+cp -r examples docs %{buildroot}%{_docdir}/%{name}-doc/
+rm %{buildroot}%{_docdir}/%{name}-doc/examples/.editorconfig
+%fdupes %{buildroot}%{_docdir}/%{name}-doc/

 %check
 export SDL_VIDEODRIVER=dummy
@@ -131,16 +131,15 @@ $python -m pygame.tests.__main__ --exclude opengl --time_out 300

 %files %{python_files}
 %doc README.rst
-%license docs/LGPL
+%license docs/LGPL.txt
 %{python_sitearch}/pygame/
-%{python_sitearch}/pygame-%{version}-py*.egg-info
+%{python_sitearch}/pygame-%{version}*-info

 %files %{python_files devel}
-%license docs/LGPL
+%license docs/LGPL.txt
 %{python_sysconfig_var INCLUDEPY}/pygame/

 %files -n %{name}-doc
-%doc docs/
-%doc examples/
+%doc %{_docdir}/%{name}-doc/

 %changelog