sdl3: 3.2.26 -> 3.2.28; sdl2-compat: 2.32.58 -> 2.32.60

pkgs/by-name/sd/sdl2-compat/package.nix

@@ -2,7 +2,6 @@
   cmake,
   lib,
   fetchFromGitHub,
-  fetchpatch2,
   ninja,
   sdl3,
   stdenv,
@@ -31,13 +30,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl2-compat";
-  version = "2.32.58";
+  version = "2.32.60";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "sdl2-compat";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-Ngmr/KG5dQ1IDVafn2Jw/29hFCzPGKc9GOenT/4fsIM=";
+    hash = "sha256-8nhSyifEeYEZj9tqid1x67jhxqmrR61NwQ/g0Z8vbw8=";
   };
 
   nativeBuildInputs = [
@@ -74,12 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./find-headers.patch
-
-    # https://github.com/libsdl-org/sdl2-compat/pull/545
-    (fetchpatch2 {
-      url = "https://github.com/libsdl-org/sdl2-compat/commit/b799076c72c2492224e81544f58f92b737cccbd3.patch?full_index=1";
-      hash = "sha256-fAc8yBlT+XFHDKcF4MFgBAz2WtXGmhYzNNrjaGSr+do=";
-    })
   ];
   setupHook = ./setup-hook.sh;
 

pkgs/by-name/sd/sdl3/package.nix

@@ -61,7 +61,7 @@ assert lib.assertMsg (ibusSupport -> dbusSupport) "SDL3 requires dbus support to
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl3";
-  version = "3.2.26";
+  version = "3.2.28";
 
   outputs = [
     "lib"
@@ -74,18 +74,14 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "libsdl-org";
     repo = "SDL";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-edcub/zeho4mB3tItp+PSD5l+H6jUPm3seiBP6ppT0k=";
+    hash = "sha256-nfnvzog1bON2IaBOeWociV82lmRY+qXgdeXBe6GYlww=";
   };
 
   postPatch =
     # Tests timeout on Darwin
-    # `testtray` loads assets from a relative path, which we are patching to be absolute
     lib.optionalString (finalAttrs.finalPackage.doCheck) ''
       substituteInPlace test/CMakeLists.txt \
         --replace-fail 'set(noninteractive_timeout 10)' 'set(noninteractive_timeout 30)'
-
-      substituteInPlace test/testtray.c \
-        --replace-warn '../test/' '${placeholder "installedTests"}/share/assets/'
     ''
     + lib.optionalString waylandSupport ''
       substituteInPlace src/video/wayland/SDL_waylandmessagebox.c \

pkgs/development/python-modules/pygame-ce/default.nix

@@ -62,11 +62,8 @@ buildPythonPackage rec {
       );
     })
 
-    # Can be removed with the next SDL3 bump.
+    # Can be removed after the SDL 3.4.0 bump.
     ./skip-rle-tests.patch
-
-    # https://github.com/pygame-community/pygame-ce/pull/3639
-    ./0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch
   ];
 
   postPatch = ''

pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch

@@ -2,14 +2,6 @@ diff --git a/test/surface_test.py b/test/surface_test.py
 index c2c91f4f5..58d916de8 100644
 --- a/test/surface_test.py
 +++ b/test/surface_test.py
-@@ -404,6 +404,7 @@ class SurfaceTypeTest(unittest.TestCase):
-         finally:
-             pygame.display.quit()
-
-+    @unittest.skipIf(True, "https://github.com/libsdl-org/SDL/pull/14429")
-     def test_solarwolf_rle_usage_2(self):
-         """Test for RLE status after setting alpha"""
-
 @@ -435,6 +436,7 @@ class SurfaceTypeTest(unittest.TestCase):
          finally:
              pygame.display.quit()