Hello community, here is the log from the commit of package python-pygame for openSUSE:Leap:15.2 checked in at 2020-03-02 13:20:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/python-pygame (Old) and /work/SRC/openSUSE:Leap:15.2/.python-pygame.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pygame" Mon Mar 2 13:20:51 2020 rev:11 rq:776972 version:1.9.6 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/python-pygame/python-pygame.changes 2020-01-15 15:51:57.347546745 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.python-pygame.new.26092/python-pygame.changes 2020-03-02 13:20:52.410102126 +0100 @@ -0,0 +1,40 @@ +------------------------------------------------------------------ +Tue Oct 15 04:11:07 UTC 2019 - Steve Kowalik <[email protected]> + +- Add python-pygame-python38-import.patch from upstream to fix a build + failure with Python 3.8. +- Use autopatch macro rather than patch0, due to multiple patches. + +------------------------------------------------------------------- +Mon May 20 08:46:49 UTC 2019 - [email protected] + +- version update to 1.9.6 + * mixer thread deadlock issue when controlling it from different + threads. + * pygame.version.vernum now has major, minor, and patch attributes. +- added patches + Do not test mp3 format. + + python-pygame-test-no-mp3.patch + +------------------------------------------------------------------- +Mon Sep 3 14:42:31 UTC 2018 - Matěj Cepl <[email protected]> + +- Clean up SPEC, avoid warnings. + +------------------------------------------------------------------- +Tue Aug 7 15:32:41 UTC 2018 - [email protected] + +- Update to 1.9.4 + * python 3.7 support. + * beta pypy support. + * pygame.draw fixes + * pygame.math is not experimental anymore. Speedups and bugfixes. + * Debian, Mac homebrew, mac virtualenv, manylinux and other platform fixes. + * documentation fixes, jedi support for type ahead in editors like VSCode and VIM. + * Surface.blits for blitting many surfaces at once more quickly. + +------------------------------------------------------------------- +Wed Jun 13 14:54:51 UTC 2018 - [email protected] + +- Get tests working. + Old: ---- pygame-1.9.3.tar.gz New: ---- pygame-1.9.6.tar.gz python-pygame-python38-import.patch python-pygame-test-no-mp3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pygame.spec ++++++ --- /var/tmp/diff_new_pack.nxutti/_old 2020-03-02 13:20:52.934103165 +0100 +++ /var/tmp/diff_new_pack.nxutti/_new 2020-03-02 13:20:52.934103165 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-pygame # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,40 +16,50 @@ # -# There are font issues in the test environment -%bcond_with test - %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pygame -Version: 1.9.3 +Version: 1.9.6 Release: 0 -Source0: https://files.pythonhosted.org/packages/source/P/Pygame/pygame-%{version}.tar.gz Summary: A Python Module for Interfacing with the SDL Multimedia Library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/Python -Url: http://www.pygame.org/ +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: SDL_image-devel -BuildRequires: SDL_mixer-devel -BuildRequires: SDL_ttf-devel BuildRequires: fdupes BuildRequires: fontconfig -BuildRequires: freetype2-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel +BuildRequires: libtiff-devel BuildRequires: libv4l-devel >= 0.8.4 +BuildRequires: pkgconfig BuildRequires: portmidi-devel BuildRequires: python-rpm-macros BuildRequires: xorg-x11 +BuildRequires: xorg-x11-devel +BuildRequires: xorg-x11-fonts +BuildRequires: xorg-x11-fonts-100dpi +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(freetype2) +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(sdl) +BuildRequires: pkgconfig(x11) Requires: fontconfig Requires: python-numpy %ifpython2 Provides: pygame = %{version} Obsoletes: pygame < %{version} %endif - %python_subpackages %description @@ -80,23 +90,23 @@ %prep %setup -q -n pygame-%{version} +%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 # Fix wrong-script-interpreter -find examples -name '*.py' -exec sed -i "s|^#!/usr/bin/env python$|#!%{__python3}|" {} \; -find examples -name '*.py' -exec sed -i "s|^#! /usr/bin/env python$|#!%{__python3}|" {} \; +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|" {} \; chmod a+x examples/*.py -%fdupes docs -%fdupes examples %build export CFLAGS="%{optflags} -fno-strict-aliasing" %python_build %install +export CFLAGS="%{optflags} -fno-strict-aliasing" %python_install %{python_expand pushd %{buildroot}%{$python_sitearch} -sed -i "s|^#!/usr/bin/env python$|#!%{__python3}|" pygame/tests/test_utils/png.py +sed -i "s|^#!%{_bindir}/env python$|#!%{_bindir}/python3|" 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 @@ -105,33 +115,31 @@ 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 . +%fdupes %{buildroot}%{$python_sitearch} popd } +%fdupes docs +%fdupes examples -%if %{with test} %check export SDL_VIDEODRIVER=dummy export SDL_AUDIODRIVER=disk +export LANG=en_US.UTF-8 %{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch} $python -m pygame.tests.__main__ --exclude opengl --time_out 300 } -%endif %files %{python_files} -%defattr(-,root,root) -%doc LGPL WHATSNEW readme.html readme.rst +%doc README.rst +%license docs/LGPL %{python_sitearch}/pygame/ %{python_sitearch}/pygame-%{version}-py*.egg-info %files %{python_files devel} -%defattr(-,root,root) -%doc LGPL +%license docs/LGPL %{python_sysconfig_var INCLUDEPY}/pygame/ %files -n %{name}-doc -%defattr(-,root,root) -%doc LGPL %doc docs/ %doc examples/ ++++++ pygame-1.9.3.tar.gz -> pygame-1.9.6.tar.gz ++++++ ++++ 279215 lines of diff (skipped) ++++++ python-pygame-python38-import.patch ++++++ >From 9b5f88bca562f37d30eb7ac0f8f4ebdda68cb494 Mon Sep 17 00:00:00 2001 From: Christoph Gohlke <[email protected]> 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 ++++++ python-pygame-test-no-mp3.patch ++++++ 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)
