Bug#1033856: unblock: mpv/0.35.1-2
On 2023-04-05 21:57:55 +0200, Sebastian Ramacher wrote:
> On 2023-04-05 19:11:25 +0200, Paul Gevers wrote:
> > Control: tags -1 moreinfo
> >
> > Hi Sebastian,
> >
> > On 02-04-2023 22:06, Sebastian Ramacher wrote:
> > > [x] attach debdiff against the package in testing
> >
> > The debdiff that I get with $(d) contains two new patches that are not part
> > of d/p/series and were not part of your debdiff (they look like copies of
> > existing patches with a different number. Was that intentional?
>
> That was a mistake - I failed to call gbp pq export with the right
> flags. I'll upload a new version cleaning that up.
Uploaded -3 and here's the new debdiff.
Cheeers
--
Sebastian Ramacher
diff -Nru mpv-0.35.1/debian/changelog mpv-0.35.1/debian/changelog
--- mpv-0.35.1/debian/changelog 2023-01-29 20:55:34.000000000 +0100
+++ mpv-0.35.1/debian/changelog 2023-04-06 08:25:35.000000000 +0200
@@ -1,3 +1,16 @@
+mpv (0.35.1-3) unstable; urgency=medium
+
+ * debian/patches: Remove duplicate patches
+
+ -- Sebastian Ramacher <sramacher@debian.org> Thu, 06 Apr 2023 08:25:35 +0200
+
+mpv (0.35.1-2) unstable; urgency=medium
+
+ * debian/patches: Apply upstream patches for yt-dlp 2023.03.04 compatibility
+ (Closes: #1033595, #1033609)
+
+ -- Sebastian Ramacher <sramacher@debian.org> Fri, 31 Mar 2023 20:46:51 +0200
+
mpv (0.35.1-1) unstable; urgency=medium
* New upstream version 0.35.1
diff -Nru mpv-0.35.1/debian/patches/0003-ytdl_hook-init-fragment-requires-other-fragments.patch mpv-0.35.1/debian/patches/0003-ytdl_hook-init-fragment-requires-other-fragments.patch
--- mpv-0.35.1/debian/patches/0003-ytdl_hook-init-fragment-requires-other-fragments.patch 1970-01-01 01:00:00.000000000 +0100
+++ mpv-0.35.1/debian/patches/0003-ytdl_hook-init-fragment-requires-other-fragments.patch 2023-03-31 20:46:45.000000000 +0200
@@ -0,0 +1,25 @@
+From: Christoph Heinrich <christoph.heinrich@student.tugraz.at>
+Date: Fri, 3 Mar 2023 00:45:45 +0100
+Subject: 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.
+---
+ player/lua/ytdl_hook.lua | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/player/lua/ytdl_hook.lua b/player/lua/ytdl_hook.lua
+index f40579a..faaff8c 100644
+--- a/player/lua/ytdl_hook.lua
++++ b/player/lua/ytdl_hook.lua
+@@ -295,7 +295,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
diff -Nru mpv-0.35.1/debian/patches/0004-ytdl_hook-only-log-error-when-no-fallback-url-availa.patch mpv-0.35.1/debian/patches/0004-ytdl_hook-only-log-error-when-no-fallback-url-availa.patch
--- mpv-0.35.1/debian/patches/0004-ytdl_hook-only-log-error-when-no-fallback-url-availa.patch 1970-01-01 01:00:00.000000000 +0100
+++ mpv-0.35.1/debian/patches/0004-ytdl_hook-only-log-error-when-no-fallback-url-availa.patch 2023-03-31 20:46:45.000000000 +0200
@@ -0,0 +1,36 @@
+From: Christoph Heinrich <christoph.heinrich@student.tugraz.at>
+Date: Fri, 3 Mar 2023 00:50:58 +0100
+Subject: 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.
+---
+ player/lua/ytdl_hook.lua | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/player/lua/ytdl_hook.lua b/player/lua/ytdl_hook.lua
+index faaff8c..362f433 100644
+--- a/player/lua/ytdl_hook.lua
++++ b/player/lua/ytdl_hook.lua
+@@ -307,7 +307,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
+@@ -421,6 +421,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 -Nru mpv-0.35.1/debian/patches/series mpv-0.35.1/debian/patches/series
--- mpv-0.35.1/debian/patches/series 2023-01-29 20:54:29.000000000 +0100
+++ mpv-0.35.1/debian/patches/series 2023-03-31 20:47:22.000000000 +0200
@@ -1,2 +1,4 @@
0001-Add-keywords-to-desktop-file.patch
0002-io-stdin-used.patch
+0003-ytdl_hook-init-fragment-requires-other-fragments.patch
+0004-ytdl_hook-only-log-error-when-no-fallback-url-availa.patch
Reply to: