From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9B41F15800A for ; Thu, 3 Aug 2023 06:45:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E600BE0B15; Thu, 3 Aug 2023 06:45:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id C81B1E0B15 for ; Thu, 3 Aug 2023 06:45:47 +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 EE983335C5A for ; Thu, 3 Aug 2023 06:45:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58ADFED4 for ; Thu, 3 Aug 2023 06:45:45 +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: <1691045037.709e2ffb08e3c920ab8f3e01b750fa3d6c1ad736.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.36.0-sub-match-audio.patch media-video/mpv/mpv-0.36.0-r1.ebuild media-video/mpv/mpv-0.36.0.ebuild X-VCS-Directories: media-video/mpv/ media-video/mpv/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 709e2ffb08e3c920ab8f3e01b750fa3d6c1ad736 X-VCS-Branch: master Date: Thu, 3 Aug 2023 06:45:45 +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: d06ea4ab-34da-45b9-92a7-febce5d7e0b3 X-Archives-Hash: e9c27a32b55b6c09792a3ed48e90b7cc commit: 709e2ffb08e3c920ab8f3e01b750fa3d6c1ad736 Author: Ionen Wolkens gentoo org> AuthorDate: Thu Aug 3 06:28:43 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Thu Aug 3 06:43:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=709e2ffb media-video/mpv: backport old sub select behavior in 0.36.0 Unsure if a 0.36.1 is coming, but if not it may be worth it before consider stabling this one. Signed-off-by: Ionen Wolkens gentoo.org> .../mpv/files/mpv-0.36.0-sub-match-audio.patch | 35 ++++++++++++++++++++++ .../{mpv-0.36.0.ebuild => mpv-0.36.0-r1.ebuild} | 1 + 2 files changed, 36 insertions(+) diff --git a/media-video/mpv/files/mpv-0.36.0-sub-match-audio.patch b/media-video/mpv/files/mpv-0.36.0-sub-match-audio.patch new file mode 100644 index 000000000000..d893b7b78c12 --- /dev/null +++ b/media-video/mpv/files/mpv-0.36.0-sub-match-audio.patch @@ -0,0 +1,35 @@ +Backport to restore --subs-with-matching-audio back to "yes" by default +like it was in <0.36 to spare users from confusion and/or needlessly +adjusting their configs until next version. + +https://github.com/mpv-player/mpv/issues/11854 +https://github.com/mpv-player/mpv/pull/12015 +https://github.com/mpv-player/mpv/commit/a2dd78fbc0932a4f47edbe4c41fe268095075c88 +--- a/DOCS/man/options.rst ++++ b/DOCS/man/options.rst +@@ -140,11 +140,11 @@ Track Selection + + ``--subs-with-matching-audio=`` + When autoselecting a subtitle track, select a full/non-forced one even if the selected +- audio stream matches your preferred subtitle language (default: no). ++ audio stream matches your preferred subtitle language (default: yes). + + ``--subs-fallback=`` + When autoselecting a subtitle track, if no tracks match your preferred languages, +- select a full track even if it doesn't match your preferred subtitle language (default: no). ++ select a full track even if it doesn't match your preferred subtitle language (default: default). + Setting this to `default` means that only streams flagged as `default` will be selected. + + ``--subs-fallback-forced=`` +--- a/options/options.c ++++ b/options/options.c +@@ -1040,7 +1040,8 @@ static const struct MPOpts mp_default_opts = { + [STREAM_SUB] = (char *[]){ "auto", NULL }, + }, + .stream_auto_sel = true, +- .subs_with_matching_audio = false, ++ .subs_with_matching_audio = true, ++ .subs_fallback = 1, + .subs_fallback_forced = true, + .audio_display = 1, + .audio_output_format = 0, // AF_FORMAT_UNKNOWN diff --git a/media-video/mpv/mpv-0.36.0.ebuild b/media-video/mpv/mpv-0.36.0-r1.ebuild similarity index 99% rename from media-video/mpv/mpv-0.36.0.ebuild rename to media-video/mpv/mpv-0.36.0-r1.ebuild index 1c181bdcbf33..5761951972fc 100644 --- a/media-video/mpv/mpv-0.36.0.ebuild +++ b/media-video/mpv/mpv-0.36.0-r1.ebuild @@ -135,6 +135,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.36.0-tests-odr.patch + "${FILESDIR}"/${PN}-0.36.0-sub-match-audio.patch ) pkg_setup() {