gentoo auto-resync : 06:03:2023 - 23:55:39

3 files changed, 61 insertions, 1 deletions

diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index efc492ca0e9b..5a5a9a2b0f39 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,9 +1,10 @@
+AUX mpv-0.35.1-yt-dlp-edl-fragments.patch 2446 BLAKE2B f43d78be7d9914abf87c3c34f99c8cb84fd463dac7b4f4cfa96268d4351006580454a2c609a655d3d036d4a72c534205d226fd4ecf8334c9a0ff016b7eecc1c0 SHA512 0cd0415dcd06f4732e87ca52f9d43ec1cbef7fab531d4f3ba7398f7a80718dc5e0b373850c5324fe9a151c3edb31a4a624854c2e09b19ab91a3c655e84261866
 DIST mpv-0.34.1.tar.gz 3288356 BLAKE2B c0e5dc3cd23307449a526bd2cf0df5d870322aa1914a139784fd50d77274d42648a769ee4da3ba74e34a7a080700a5740dae13ed0827df1b3cfef36846f983ab SHA512 77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e
 DIST mpv-0.35.0.tar.gz 3365752 BLAKE2B 9b8dca943fc60a68f8474549d75c021dd9157195253c5ec09721969e500b2756c033e86975499f5632f0c943ac7bb54699f47340f0dee73d7284668d4419b17f SHA512 d5c1f734057f6b6c27e7f59de43cf7c0e7f813d842b8c7fd2ae1073dbe649c8187b7686df4efe928db2952e9f1efc171245e6f8780c1d9f174f4d7abff1e073a
 DIST mpv-0.35.1.tar.gz 3367913 BLAKE2B 706a2031a2ca973eb3a092ec7f62ba40ca4dfd78e3ffe5d6e432486b0018852b034152a21805be594054178ccb17856dafe2b860cddcc22d27df895d163871de SHA512 42f3564a9ed4d972d14b2c697b0163f06a8bb68a0606a86c34935181247c783e3cb62286b445799998def0919fb13fce8b8f6453f82652d5bfaea5929119127a
 DIST waf-2.0.22 104880 BLAKE2B 6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0 SHA512 4156cefa65b7e6349ddb1ca643bbdf3e4444449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292
 EBUILD mpv-0.34.1-r1.ebuild 9733 BLAKE2B 0edc617690adea48d4cd253a28aa56906684a55272630a9163b2573887afad4fd288bd9db72133494ac9cb58cb9415b9195415d61671430e4a1c19f63e833df3 SHA512 8710249d67c5c48dc4c9788ad8e0fef7a6ace8b52306da1b900a3098227115c547ed3b86b2389c32798df3d13bfa7a458303d8e0266258ffc205f7387823572b
 EBUILD mpv-0.35.0-r1.ebuild 7715 BLAKE2B 697a5320c5f572b7932894656313661c99d0ccc8824ba40d23de535824ae4a48ba93dc34f64f341e901f190a5fa8d32b8303839bb10eab9f7a9891da899180ad SHA512 6bb601e58c4c5cbc161d6dc71f253557c17359d7c1bb0505d0db407fda2b259c519cd98eb268608ba8054034c2ff9312596505044c1d75d85b3d51160da73e1f
-EBUILD mpv-0.35.1.ebuild 7523 BLAKE2B 7fc73d01058aaddab3708b04730cd0bc9485111212245450d2036e46eaa518423c2023da427553f3f09d539fd4837ed61db9de7abd3ed03fa36a1cbf32775c7f SHA512 99decef6d6f899b259deb7f304ef05b66c5f9983adb7d2f55fc6b8294f3ff332a5e000d5f8c2d087e43dbc2329bc13f1b6417e787b596c3cb843b4e199c6781c
+EBUILD mpv-0.35.1-r1.ebuild 7583 BLAKE2B 5a177a136a316bf639310d240c805384bc787f1f4741cd0bf318174a1c5998cf5bde55a469e0cf16664db29df7f7c389d3fa4ce9723c40eff314c6d93bad63de SHA512 5ad755fadd14b6083ced955f598c4968da98b83dc15615b026d6ff175e85e152a05f64eeb6a0f560a1e9761887429ad27c6640ec74eb5b6998c429c9baf88d31
 EBUILD mpv-9999.ebuild 7013 BLAKE2B f1a7f7bebd38ef06b455c16bf8be0bfeb4cd050d805ecffb9c9d5445e15c82ba766be6995b8503582568b8c708c0051081ae4db367a5c0f984f063a22b022bb8 SHA512 6e53676790a99b5c6610747fcc652962aacb79b18df2db905e4483ec8c7f7f149bf6f3757b8f98ad36fa8364dc22e8ab639ccd71a51f65e8fecec4d63a784767
 MISC metadata.xml 2537 BLAKE2B ce08ff18966b0937d5c1564a32d8da1225d603626d02b081f8a236531683890770d134fb7898a208bceffeb7ed2d1cabf34f4d211a97d1d0d95287830b93ddbc SHA512 5dc6cdacffed6f751a05d261a23e765cf3eaa16bd0757853635da977176666f5fc75f0a6c759ccbfcfdd63c2732a0b53858f0379d5f3437bcd9b40a7cb82f59c
diff --git a/media-video/mpv/files/mpv-0.35.1-yt-dlp-edl-fragments.patch b/media-video/mpv/files/mpv-0.35.1-yt-dlp-edl-fragments.patch
new file mode 100644
index 000000000000..058c608233d4
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.35.1-yt-dlp-edl-fragments.patch
@@ -0,0 +1,55 @@
+https://bugs.gentoo.org/899956
+https://github.com/mpv-player/mpv/pull/11398
+
+From 985655ebfd77ceddc44d76f8cc6dc446002f34ee Mon Sep 17 00:00:00 2001
+From: Christoph Heinrich <christoph.heinrich@student.tugraz.at>
+Date: Fri, 3 Mar 2023 00:45:45 +0100
+Subject: [PATCH 1/2] ytdl_hook: init fragment requires other fragments
+
+With dash the first fragment was always considered an init fragment if
+there wasn't a duration. However that only makes sense when there are
+also other fragments, so check if there are other fragments in addition
+to the lack of a duration.
+--- a/player/lua/ytdl_hook.lua
++++ b/player/lua/ytdl_hook.lua
+@@ -297,7 +297,7 @@ local function edl_track_joined(fragments, protocol, is_live, base)
+         local args = ""
+ 
+         -- assume MP4 DASH initialization segment
+-        if not fragments[1].duration then
++        if not fragments[1].duration and #fragments > 1 then
+             msg.debug("Using init segment")
+             args = args .. ",init=" .. edl_escape(join_url(base, fragments[1]))
+             offset = 2
+
+From a5961ad096b1361a12f836c8b170fc748f46962a Mon Sep 17 00:00:00 2001
+From: Christoph Heinrich <christoph.heinrich@student.tugraz.at>
+Date: Fri, 3 Mar 2023 00:50:58 +0100
+Subject: [PATCH 2/2] ytdl_hook: only log error when no fallback url available
+
+An error indicates that something doesn't work, but as long as a
+safe url is available, playback is still expected to work.
+
+Thus reduce logging level of MP4 DASH without fragments message and
+add a new error message for when there is no safe url available either.
+
+Also adds a missing space.
+--- a/player/lua/ytdl_hook.lua
++++ b/player/lua/ytdl_hook.lua
+@@ -309,7 +309,7 @@ local function edl_track_joined(fragments, protocol, is_live, base)
+         -- if not available in all, give up.
+         for i = offset, #fragments do
+             if not fragments[i].duration then
+-                msg.error("EDL doesn't support fragments" ..
++                msg.verbose("EDL doesn't support fragments " ..
+                          "without duration with MP4 DASH")
+                 return nil
+             end
+@@ -423,6 +423,7 @@ local function formats_to_edl(json, formats, use_all_formats)
+             track.protocol, json.is_live,
+             track.fragment_base_url)
+         if not edl_track and not url_is_safe(track.url) then
++            msg.error("No safe URL or supported fragmented stream available")
+             return nil
+         end
+ 
diff --git a/media-video/mpv/mpv-0.35.1.ebuild b/media-video/mpv/mpv-0.35.1-r1.ebuild
index 5ea6dc240af6..9d2d6ee62ae3 100644
--- a/media-video/mpv/mpv-0.35.1.ebuild
+++ b/media-video/mpv/mpv-0.35.1-r1.ebuild
@@ -133,6 +133,10 @@ BDEPEND="
 	cli? ( dev-python/docutils )
 	wayland? ( dev-util/wayland-scanner )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-yt-dlp-edl-fragments.patch
+)
+
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 	python-single-r1_pkg_setup