~ruther/guix-local

82f286efb989f625da5975bc829ba08ed5d14cfa — Sergey Trofimov 2 months ago e21d6a3
gnu: mpv: Update to 0.41.0.

* gnu/packages/video.scm (mpv): Update to 0.41.0.
* gnu/packages/patches/mpv-0.40.0-fix-ffmpeg-8.0.patch: Remove.
* gnu/packages/patches/mpv-0.40.0-fix-wayland-cpu-usage.patch: Remove.
* gnu/local.mk: Remove obsolete patches.

Change-Id: I03d942a910fc42f1fba602bc3fa98cbb8a73f44e
Signed-off-by: Ian Eure <ian@retrospec.tv>
4 files changed, 2 insertions(+), 82 deletions(-)

M gnu/local.mk
D gnu/packages/patches/mpv-0.40.0-fix-ffmpeg-8.0.patch
D gnu/packages/patches/mpv-0.40.0-fix-wayland-cpu-usage.patch
M gnu/packages/video.scm
M gnu/local.mk => gnu/local.mk +0 -2
@@ 1880,8 1880,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/mpc123-initialize-ao.patch		\
  %D%/packages/patches/mpg321-CVE-2019-14247.patch		\
  %D%/packages/patches/mpg321-gcc-10.patch			\
  %D%/packages/patches/mpv-0.40.0-fix-ffmpeg-8.0.patch		\
  %D%/packages/patches/mpv-0.40.0-fix-wayland-cpu-usage.patch	\
  %D%/packages/patches/modglue-fix-build.patch		\
  %D%/packages/patches/modem-manager-fix-test-wrapper.patch	\
  %D%/packages/patches/module-init-tools-moduledir.patch	\

D gnu/packages/patches/mpv-0.40.0-fix-ffmpeg-8.0.patch => gnu/packages/patches/mpv-0.40.0-fix-ffmpeg-8.0.patch +0 -40
@@ 1,40 0,0 @@
Patch obtained from https://github.com/mpv-player/mpv/commit/26b29fba02a2782f68e2906f837d21201fc6f1b9
See https://github.com/mpv-player/mpv/issues/16176 for discussion. Next version
of mpv will have this fixed, but upstream is not planning to release a patch
release.

From 26b29fba02a2782f68e2906f837d21201fc6f1b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
Date: Fri, 28 Mar 2025 19:12:01 +0100
Subject: [PATCH] demux_mkv: fix compilation after deprecated definitions
 removal

See: https://github.com/FFmpeg/FFmpeg/commit/822432769868da325ba03774df1084aa78b9a5a0
---
 demux/demux_mkv.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 135edcc23d82b..cc7ce3e98f4f6 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -2200,16 +2200,16 @@ static int demux_mkv_open_sub(demuxer_t *demuxer, mkv_track_t *track)
             // [0x30..0x37] are component tags utilized for
             // non-mobile captioning service ("profile A").
             if (component_tag >= 0x30 && component_tag <= 0x37)
-                lav->profile = FF_PROFILE_ARIB_PROFILE_A;
+                lav->profile = AV_PROFILE_ARIB_PROFILE_A;
             break;
         case 0x0012:
             // component tag 0x87 signifies a mobile/partial reception
             // (1seg) captioning service ("profile C").
             if (component_tag == 0x87)
-                lav->profile = FF_PROFILE_ARIB_PROFILE_C;
+                lav->profile = AV_PROFILE_ARIB_PROFILE_C;
             break;
         }
-        if (lav->profile == FF_PROFILE_UNKNOWN)
+        if (lav->profile == AV_PROFILE_UNKNOWN)
             MP_WARN(demuxer, "ARIB caption profile %02x / %04x not supported.\n",
                     component_tag, data_component_id);
     }

D gnu/packages/patches/mpv-0.40.0-fix-wayland-cpu-usage.patch => gnu/packages/patches/mpv-0.40.0-fix-wayland-cpu-usage.patch +0 -34
@@ 1,34 0,0 @@
Upstream-status: https://github.com/mpv-player/mpv/pull/16140

From d20ded876d27497d3fe6a9494add8106b507a45c Mon Sep 17 00:00:00 2001
From: llyyr <llyyr.public@gmail.com>
Date: Fri, 28 Mar 2025 15:34:33 +0530
Subject: [PATCH] clipboard-wayland: prevent reading from hung up fd

This causes mpv to use up 100% of a core if there's an offer for a
mime_type that mpv doesn't accept with ext_data_control clipboard
backend.
---
 player/clipboard/clipboard-wayland.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/player/clipboard/clipboard-wayland.c b/player/clipboard/clipboard-wayland.c
index c4a5e50472..bd8ac35af2 100644
--- a/player/clipboard/clipboard-wayland.c
+++ b/player/clipboard/clipboard-wayland.c
@@ -348,6 +348,12 @@ static bool clipboard_wayland_dispatch_events(struct clipboard_wayland_priv *wl,
     if (fds[1].revents & POLLIN)
         return false;
 
+    if (fds[2].revents & (POLLERR | POLLHUP | POLLNVAL))
+        destroy_offer(wl->selection_offer);
+
+    if (fds[3].revents & (POLLERR | POLLHUP | POLLNVAL))
+        destroy_offer(wl->primary_selection_offer);
+
     if (fds[2].revents & POLLIN)
         get_selection_data(wl, wl->selection_offer, false);
 
-- 
2.51.0


M gnu/packages/video.scm => gnu/packages/video.scm +2 -6
@@ 2732,7 2732,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
(define-public mpv
  (package
    (name "mpv")
    (version "0.40.0")
    (version "0.41.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference


@@ 2740,11 2740,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
                    (commit (string-append "v" version))))
              (file-name (git-file-name name version))
              (sha256
               (base32 "0w0qk61ll0mddbkiwavqfx048sacyvp6fwglms58ypw869rh7iy7"))
              (patches
               (search-patches
                "mpv-0.40.0-fix-ffmpeg-8.0.patch"
                "mpv-0.40.0-fix-wayland-cpu-usage.patch"))))
               (base32 "1myphqbzr4xynhzmc9ic34mqwb2yc0v37xh8js517sy4ydzam5c0"))))
    (build-system meson-build-system)
    (arguments
     (list