Control: tags -1 patch

This issue is already fixed upstream, see:

 https://github.com/pygame/pygame/pull/3577

The attached patch fixes the issue.

Kind Regards,

Bas

--
 GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146  50D1 6750 F10A E88D 4AF1
diff -Nru pygame-2.1.2+dfsg/debian/changelog pygame-2.1.2+dfsg/debian/changelog
--- pygame-2.1.2+dfsg/debian/changelog  2022-08-29 12:47:50.000000000 +0000
+++ pygame-2.1.2+dfsg/debian/changelog  2022-12-28 09:37:24.000000000 +0000
@@ -1,3 +1,11 @@
+pygame (2.1.2+dfsg-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Add upstream patch to fix FTBFS with SDL 2.26.0.
+    (closes: #1026483)
+
+ -- Bas Couwenberg <sebas...@debian.org>  Wed, 28 Dec 2022 10:37:24 +0100
+
 pygame (2.1.2+dfsg-4) unstable; urgency=medium
 
   * Team upload
diff -Nru 
pygame-2.1.2+dfsg/debian/patches/pr3577-Adjust-surface-masks-to-create-a-proper-24-bit-Surface.patch
 
pygame-2.1.2+dfsg/debian/patches/pr3577-Adjust-surface-masks-to-create-a-proper-24-bit-Surface.patch
--- 
pygame-2.1.2+dfsg/debian/patches/pr3577-Adjust-surface-masks-to-create-a-proper-24-bit-Surface.patch
        1970-01-01 00:00:00.000000000 +0000
+++ 
pygame-2.1.2+dfsg/debian/patches/pr3577-Adjust-surface-masks-to-create-a-proper-24-bit-Surface.patch
        2022-12-28 09:37:24.000000000 +0000
@@ -0,0 +1,19 @@
+Description: Adjust surface masks to create a proper 24 bit Surface
+ The SDL 2.26.0 pre-release rejects a 24 bit Surface created with this mask,
+ which is the right call, as it needs 32 bits of space. Older SDL went ahead
+ and created a 32 bit surface anyway, which it probably shouldn't have.
+Author: Starbuck5 <46412508+starbu...@users.noreply.github.com>
+Origin: https://github.com/pygame/pygame/pull/3577
+Bug-Debian: https://bugs.debian.org/1026483
+
+--- a/test/surface_test.py
++++ b/test/surface_test.py
+@@ -2013,7 +2013,7 @@ class GeneralSurfaceTests(AssertRaisesRe
+             mask8 = (224, 28, 3, 0)
+             mask15 = (31744, 992, 31, 0)
+             mask16 = (63488, 2016, 31, 0)
+-            mask24 = (4278190080, 16711680, 65280, 0)
++            mask24 = (16711680, 65280, 255, 0)
+             mask32 = (4278190080, 16711680, 65280, 255)
+ 
+             # Surfaces with standard depths and masks
diff -Nru pygame-2.1.2+dfsg/debian/patches/series 
pygame-2.1.2+dfsg/debian/patches/series
--- pygame-2.1.2+dfsg/debian/patches/series     2022-08-29 12:47:50.000000000 
+0000
+++ pygame-2.1.2+dfsg/debian/patches/series     2022-12-28 09:37:24.000000000 
+0000
@@ -6,3 +6,4 @@
 skip-test_src_alpha_sdl2_blitter.patch
 skip-tests-big-endian.patch
 Don-t-assume-that-each-SDL-minor-version-is-incompatible-.patch
+pr3577-Adjust-surface-masks-to-create-a-proper-24-bit-Surface.patch

Reply via email to