gentoo auto-resync : 03:08:2023 - 10:53:03

3 files changed, 38 insertions, 1 deletions

diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 6ad56f4aa280..80a59cfce489 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,10 +1,11 @@
 AUX mpv-0.35.1-pipewire-0.3.75.patch 3024 BLAKE2B 5cbd566d7f63f660574765a401fba6bb5853e17e2faebab7ff7bd667595feac7b92eaa7f78199aa1dec91c8d894facd3f80815d3ac573ab741d974b5d86bf97a SHA512 b181304528836ce6cd5ee1d660bfb11cabc7e4c541c75970c9b0e8d6554016a5d9af4d8ae228ba4dc1deb01b72ae52b8a810db1d6c17048516a693230c904730
 AUX mpv-0.35.1-yt-dlp-edl-fragments.patch 2446 BLAKE2B f43d78be7d9914abf87c3c34f99c8cb84fd463dac7b4f4cfa96268d4351006580454a2c609a655d3d036d4a72c534205d226fd4ecf8334c9a0ff016b7eecc1c0 SHA512 0cd0415dcd06f4732e87ca52f9d43ec1cbef7fab531d4f3ba7398f7a80718dc5e0b373850c5324fe9a151c3edb31a4a624854c2e09b19ab91a3c655e84261866
+AUX mpv-0.36.0-sub-match-audio.patch 1621 BLAKE2B aa774960703d3b5f2f5a8c3dc327bba0fa8865fdc676c68fdaf79cf46f7209fd629db5e523f4f845ce0aaf17d0a8c910c6c1c2c8fabe98340e5c61a31d8c4d36 SHA512 c260ad68a7e003f43b0b4525fb7eff5f5784851beba303a934b90b0e69476c5912cc75217a78820884d1fdcc1e7431574bdb6b55cb9e434735cdfbdeadfb3a0e
 AUX mpv-0.36.0-tests-odr.patch 1118 BLAKE2B 8a87385922af6ee08adc3972ce2271f1f700842dba8415ac27f04ba7147b070b665279c7b4d50e06b85d258a9ab47db23a82a9f9a4db444efb97a677ef2f6317 SHA512 8ccec2ce0108468c8fc048d3e892b1c8f177f434809d899f38a00526515b1453e0cb5cd2bfd5843568a025fda314fd172c94c548c8e144514353904066b917f3
 DIST mpv-0.35.1.tar.gz 3367913 BLAKE2B 706a2031a2ca973eb3a092ec7f62ba40ca4dfd78e3ffe5d6e432486b0018852b034152a21805be594054178ccb17856dafe2b860cddcc22d27df895d163871de SHA512 42f3564a9ed4d972d14b2c697b0163f06a8bb68a0606a86c34935181247c783e3cb62286b445799998def0919fb13fce8b8f6453f82652d5bfaea5929119127a
 DIST mpv-0.36.0.tar.gz 3409178 BLAKE2B 7260c265f02918d4caf72d8d8ecc9d4ab9783d66d675bd683a2f9c228404ad978c6fe0aa50f486b5257740176bc26f8abde7eff20d89019d5f701ec78c7743e1 SHA512 51f455a425ea5aac47acb3582d0f958a34248a2290a8d6887d22bcb9385fe8d1ab5d7f09d5408cfecfb73c1ec85d1b8ec8958e45a4941d3f711a2e580187472f
 EBUILD mpv-0.35.1-r1.ebuild 7610 BLAKE2B 0e2a9d6c0817f92995d53055357a4b1757b126bb7d4c105d3542630df9410475560f98772fbc021855a6e3acd029d7bbaf3cb50fc2734dd9122a05be50aab5fb SHA512 b04ea9db0876192883f62cf0ede1b2df633b7c0691d482248b1e765dd779a50679a9e11785943b218e73bfc66bdb2c3eb952765077f8e7b3de0774b2cab31f8c
 EBUILD mpv-0.35.1-r2.ebuild 7652 BLAKE2B 7042109178a580d3d88bf7781cc7d1e8c503ba404eaff4512061a1d6526aa4aedb33537e103dedf5d2beec61fd4978b1762dd6de8950b1a31effadd601e5a905 SHA512 594c7b3a433ff96ec7ea84633e5660580fcf5b79d1c3021714d1b79782065e391895762795ccd796c3ad265b4c087ebc75582b07a8a8d6b5b7a66ff3bd9d93bb
-EBUILD mpv-0.36.0.ebuild 7479 BLAKE2B 90d8d43f7d708ef2b5682693af0e21aadb2d7589e2bfb7d1697bc60d9b872e334ee7c2b503911b94e07960f5359e68f3cda506cccfc00c79de602c486c10b293 SHA512 74de9e2a8fffec2dcd11fe9afaf1858472b124df66e1f44a116f126c5efa8ad2b4cd9793492c8b66e19bb22b6f82ff83fee2d94e1e30c4b2018faf84910b4608
+EBUILD mpv-0.36.0-r1.ebuild 7529 BLAKE2B 2d12c8213783522eacb9d5b12d47e1ebccd219b988e8df93f3b9eb646ff8c09fc1dc1be35395d27b6268c11ccd8b9d5855e2f30fa860bb7a5a5e52955044ebf8 SHA512 ea26bf934045adf3357ad64f67c9d8d9c724f85ad96c14e9bbac8b718dfa5031d210f07523d970d1eeed359bb269900b2959968f893c40b91c0dbb8f721eac49
 EBUILD mpv-9999.ebuild 7381 BLAKE2B 347ce0a07a9903bd5f761057a0a6bc525a6b6f64aa3592a9c4e5112c740912b16ebf6b335939b74a03a0451b05fae7cc7c10eb60de7d10ea933859f83f687d33 SHA512 1f897722fdbcf449ec311d7351c1961303923422a471624c4c5106825ee57aa7034262571677228aac33bd52d90d80b2cceb17fd1e68bdd5d0b25b4ad543fc25
 MISC metadata.xml 2324 BLAKE2B 6fe57270fef9275f47b0d7f282fbf4ff5c4a76c74e43820a8e0a4d56348eb72dc89dfdb06a9ff9a2b6f73d35102f861200d6c8c6f4dc41cfb4e42ff69d70da8a SHA512 0418e3315b4ded29714099d80075f61f6d1b38d9109bbb3bc372abbaceb14f705d5798eac2c14ef0fd0e1c557785291a4acb5e773dffb46f0b7f7962bf38d041
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=<yes|no>``
+     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=<yes|default|no>``
+     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=<yes|no>``
+--- 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
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() {