From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C7D0E158074 for ; Wed, 25 Jun 2025 15:25:28 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 0F43F341098 for ; Wed, 25 Jun 2025 15:25:28 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 835F111055C; Wed, 25 Jun 2025 15:25:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 7957E11055C for ; Wed, 25 Jun 2025 15:25:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2BF82340E99 for ; Wed, 25 Jun 2025 15:25:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9DBD92A76 for ; Wed, 25 Jun 2025 15:25:20 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1750864743.6b9d8da01e17743a57b79f8db59a830951addb8d.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/, media-video/mpv/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mpv/files/mpv-0.40.0-wayland-clipboard-cpu.patch media-video/mpv/mpv-0.40.0-r2.ebuild media-video/mpv/mpv-0.40.0-r3.ebuild X-VCS-Directories: media-video/mpv/files/ media-video/mpv/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 6b9d8da01e17743a57b79f8db59a830951addb8d X-VCS-Branch: master Date: Wed, 25 Jun 2025 15:25:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2005e3da-efd3-42b4-8b35-847bbe4fe84f X-Archives-Hash: 26a32caa5021817b8bf3235c7d4aa1b3 commit: 6b9d8da01e17743a57b79f8db59a830951addb8d Author: Ionen Wolkens gentoo org> AuthorDate: Wed Jun 25 15:14:28 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Jun 25 15:19:03 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b9d8da0 media-video/mpv: backport cpu usage fix with wayland clipboard Kind of simple, so doing it straight-to-stable. Closes: https://bugs.gentoo.org/959000 Signed-off-by: Ionen Wolkens gentoo.org> .../mpv/files/mpv-0.40.0-wayland-clipboard-cpu.patch | 16 ++++++++++++++++ .../mpv/{mpv-0.40.0-r2.ebuild => mpv-0.40.0-r3.ebuild} | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/media-video/mpv/files/mpv-0.40.0-wayland-clipboard-cpu.patch b/media-video/mpv/files/mpv-0.40.0-wayland-clipboard-cpu.patch new file mode 100644 index 000000000000..0432d65b29b5 --- /dev/null +++ b/media-video/mpv/files/mpv-0.40.0-wayland-clipboard-cpu.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/959000 +https://github.com/mpv-player/mpv/issues/16139 +https://github.com/mpv-player/mpv/pull/16140 +--- a/player/clipboard/clipboard-wayland.c ++++ b/player/clipboard/clipboard-wayland.c +@@ -349,4 +349,10 @@ + 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); diff --git a/media-video/mpv/mpv-0.40.0-r2.ebuild b/media-video/mpv/mpv-0.40.0-r3.ebuild similarity index 99% rename from media-video/mpv/mpv-0.40.0-r2.ebuild rename to media-video/mpv/mpv-0.40.0-r3.ebuild index 61d81da0b6eb..d1d23d274ba2 100644 --- a/media-video/mpv/mpv-0.40.0-r2.ebuild +++ b/media-video/mpv/mpv-0.40.0-r3.ebuild @@ -124,6 +124,10 @@ BDEPEND=" wayland? ( dev-util/wayland-scanner ) " +PATCHES=( + "${FILESDIR}"/${P}-wayland-clipboard-cpu.patch +) + pkg_pretend() { if has_version "${CATEGORY}/${PN}[X,opengl]" && use !egl; then #953107 ewarn "${PN}'s 'opengl' USE was removed in favour of the 'egl' USE as it was"