commit: 9bbedbf3edd44c471f5e4712bc897b5b2638eb37
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Feb 22 05:06:50 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Feb 22 06:14:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bbedbf3
media-video/mpv: drop 0.36.0-r1
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/Manifest | 1 -
.../mpv/files/mpv-0.36.0-sub-match-audio.patch | 35 ---
media-video/mpv/files/mpv-0.36.0-tests-odr.patch | 30 ---
media-video/mpv/metadata.xml | 1 -
media-video/mpv/mpv-0.36.0-r1.ebuild | 292 -
profiles/arch/amd64/package.use.mask | 2 +-
profiles/arch/base/package.use.mask| 2 +-
profiles/arch/powerpc/ppc64/64le/package.use.mask | 2 +-
profiles/arch/x86/package.use.mask | 4 +-
9 files changed, 5 insertions(+), 364 deletions(-)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 60b418e98698..8e655e8b32c6 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,2 +1 @@
-DIST mpv-0.36.0.tar.gz 3409178 BLAKE2B
7260c265f02918d4caf72d8d8ecc9d4ab9783d66d675bd683a2f9c228404ad978c6fe0aa50f486b5257740176bc26f8abde7eff20d89019d5f701ec78c7743e1
SHA512
51f455a425ea5aac47acb3582d0f958a34248a2290a8d6887d22bcb9385fe8d1ab5d7f09d5408cfecfb73c1ec85d1b8ec8958e45a4941d3f711a2e580187472f
DIST mpv-0.37.0.tar.gz 3384190 BLAKE2B
31d8d47ed7ae94540189fe05b7ea63f5b0d5c987a22191f931e4bd90664d05dca4c7e0bd0e05fcdf48b977e38e5f8eec0d2572265f2cf4a969a8a9a9dbf83d68
SHA512
a2f7fb3837312ec59c50427af7be3b2b1b6175a53ccc7463e81503284fc4047dff32cb105d665d80be77ee1ae775d4512b71584f324d6d202c9a7fc1fab53257
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
deleted file mode 100644
index d893b7b78c12..
--- a/media-video/mpv/files/mpv-0.36.0-sub-match-audio.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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/files/mpv-0.36.0-tests-odr.patch
b/media-video/mpv/files/mpv-0.36.0-tests-odr.patch
deleted file mode 100644
index 1c7c05c20f78..
--- a/media-video/mpv/files/mpv-0.36.0-tests-odr.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Quickfix for USE=test with -Werror=odr (stubs, so have no real consequences).
-
-timer.h gets indirectly included and can declare these differently, have not
-looked closer yet.
a/test/test_utils.c
-+++ b/test/test_utils.c
-@@ -110,6 +110,6 @@
- #ifndef WIN32_TESTS
--void mp_add_timeout(void) {};
--void mp_rel_time_to_timespec(void) {};
--void mp_time_us(void) {};
--void mp_time_us_to_timespec(void) {};
-+void mp_add_timeout(int64_t time_us, double timeout_sec) {};
-+struct timespec mp_rel_time_to_timespec(double timeout_sec) {return (struct
timespec){0};};
-+int64_t mp_time_us(void) {return 0;};
-+struct timespec mp_time_us_to_timespec(int64_t time_us) {return (struct
timespec){0};};
- #endif
a/test/test_utils.h
-+++ b/test/test_utils.h
-@@ -61,6 +61,6 @@
- #ifndef WIN32_TESTS
--void mp_add_timeout(void);
--void mp_rel_time_to_timespec(void);
--void mp_time_us(void);
--void mp_time_us_to_timespec(void);
-+void mp_add_timeout(int64_t time_us, double timeout_sec);
-+struct timespec mp_rel_time_to_timespec(double
