Merge master into staging-next

pkgs/applications/video/mpv/default.nix

@@ -98,7 +98,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mpv";
-  version = "0.40.0";
+  version = "0.41.0";
 
   outputs = [
     "out"
@@ -111,33 +111,9 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "mpv-player";
     repo = "mpv";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-x8cDczKIX4+KrvRxZ+72TGlEQHd4Kx7naq0CSoOZGHA=";
+    hash = "sha256-gJWqfvPE6xOKlgj2MzZgXiyOKxksJlY/tL6T/BeG19c=";
   };
 
-  patches = [
-    # ffmpeg-8 compat:
-    #   https://github.com/mpv-player/mpv/pull/16145
-    (fetchpatch {
-      name = "ffmpeg-8.patch";
-      url = "https://github.com/mpv-player/mpv/commit/26b29fba02a2782f68e2906f837d21201fc6f1b9.patch";
-      hash = "sha256-ANNoTtIJBARHbm5IgrE0eEZyzmNhOnbVgve7iqCBzQg=";
-    })
-    # clipboard-wayland: prevent reading from hung up fd:
-    #   https://github.com/mpv-player/mpv/pull/16140
-    (fetchpatch {
-      name = "clipboard-wayland-prevent-hung-up-fd.patch";
-      url = "https://github.com/mpv-player/mpv/commit/d20ded876d27497d3fe6a9494add8106b507a45c.patch";
-      hash = "sha256-sll4BpeVW6OA+/vbH7ZfIh0/vePfPEX87vzUu/GCj44=";
-    })
-    # clipboard-wayland: read already sent data when the fd is hung up:
-    #   https://github.com/mpv-player/mpv/pull/16236
-    (fetchpatch {
-      name = "clipboard-wayland-read-sent-data-on-hangup.patch";
-      url = "https://github.com/mpv-player/mpv/commit/896b3400f3cad286533dbb9cc3658ce18ed9966c.patch";
-      hash = "sha256-GU0VdYC/Q0RCS/I2h4gBVNhScDLSAB2KxN3Ca6CGBMM=";
-    })
-  ];
-
   postPatch = lib.concatStringsSep "\n" [
     # Don't reference compile time dependencies or create a build outputs cycle
     # between out and dev
@@ -170,7 +146,9 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "dvbin" dvbinSupport)
     (lib.mesonEnable "dvdnav" dvdnavSupport)
     (lib.mesonEnable "openal" openalSupport)
-    (lib.mesonEnable "sdl2" sdl2Support)
+    (lib.mesonEnable "sdl2-audio" sdl2Support)
+    (lib.mesonEnable "sdl2-gamepad" sdl2Support)
+    (lib.mesonEnable "sdl2-video" sdl2Support)
   ];
 
   mesonAutoFeatures = "auto";