From 25e845cfca76a6283746e960c9b846688ab56902 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Thu, 28 Apr 2022 10:34:44 +0200 Subject: [PATCH] Update to 1.5.23 --- .gitignore | 1 + pyglet-1.5.16-backport-pr-469.patch | 21 --------------------- python-pyglet.spec | 14 ++++++++------ sources | 2 +- 4 files changed, 10 insertions(+), 28 deletions(-) delete mode 100644 pyglet-1.5.16-backport-pr-469.patch diff --git a/.gitignore b/.gitignore index d1b7169..bd8b7e2 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /pyglet-1.5.11-repacked.tar.gz /pyglet-1.5.16.tar.gz /pyglet-1.5.16-repacked.tar.gz +/pyglet-1.5.23-repacked.tar.gz diff --git a/pyglet-1.5.16-backport-pr-469.patch b/pyglet-1.5.16-backport-pr-469.patch deleted file mode 100644 index e2ef360..0000000 --- a/pyglet-1.5.16-backport-pr-469.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur pyglet-1.5.16-original/tests/unit/media/test_synthesis.py pyglet-1.5.16/tests/unit/media/test_synthesis.py ---- pyglet-1.5.16-original/tests/unit/media/test_synthesis.py 2021-04-13 05:57:56.000000000 -0400 -+++ pyglet-1.5.16/tests/unit/media/test_synthesis.py 2021-10-10 14:46:08.063474857 -0400 -@@ -1,4 +1,5 @@ - import unittest -+import wave - - from ctypes import sizeof - from io import BytesIO -@@ -79,9 +80,8 @@ - source_name = self.source_class.__name__.lower() - filename = "synthesis_{0}_{1}_{2}_1ch.wav".format(source_name, sample_size, sample_rate) - -- with open(get_test_data_file('media', filename), 'rb') as f: -- # discard the wave header: -- loaded_bytes = f.read()[44:] -+ with wave.open(get_test_data_file('media', filename)) as f: -+ loaded_bytes = f.readframes(-1) - source.seek(0) - generated_data = source.get_audio_data(source._max_offset) - bytes_buffer = BytesIO(generated_data.data).getvalue() diff --git a/python-pyglet.spec b/python-pyglet.spec index 58abd6d..06d8aa5 100644 --- a/python-pyglet.spec +++ b/python-pyglet.spec @@ -4,8 +4,8 @@ %bcond_without tests Name: python-%{srcname} -Version: 1.5.16 -Release: 5%{?dist} +Version: 1.5.23 +Release: 1%{?dist} Summary: A cross-platform windowing and multimedia library for Python License: BSD @@ -20,10 +20,6 @@ URL: http://www.pyglet.org/ Source0: %{versionedname}-repacked.tar.gz Source1: pyglet-get-tarball.sh -# Backport upstream patch for big-endian support to remove ExcludeArch: -# https://github.com/pyglet/pyglet/pull/469 -Patch0: pyglet-1.5.16-backport-pr-469.patch - # Note that unbundling pypng removes "PNGImageDecoder", which is normally # available for advanced use cases. Instead of: # img = image.load(fname, decoder=PNGImageDecoder) # don't use! @@ -151,6 +147,12 @@ ln -s %{_datadir}/sounds/purple/*.wav tests/data/media/ %changelog +* Thu Apr 28 2022 Petr Viktorin - 1.5.23-1 +- Update to 1.5.23 +- This version should not attempt to use the incompatible ffmpeg 5.0, + and fall back to another sound backend if available. + Resolves: RHBZ#2075965 + * Fri Jan 21 2022 Fedora Release Engineering - 1.5.16-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index d83243d..93282d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pyglet-1.5.16-repacked.tar.gz) = 70df7e9f5d5e8c26b040b187b605dd56d4a4c588b99261b68d4a84f5a6154c9b940c17a99ee375cef28ca3b537f85c4ad3937a1e8534a66d81292c9eac0870dd +SHA512 (pyglet-1.5.23-repacked.tar.gz) = 3385bcfe93ed3b50e1fd8e3c148fc363a72615ece8a2f4ba136df71e480d4c556e0dbd9183911746cdcbe7245aad49f825f6640866e39bd39c204cca6142b3f6