Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] yt-dlp: update to 2023.03.03.
@ 2023-03-04 11:04 eljamm
  2023-03-04 12:06 ` [PR PATCH] [Updated] [WIP] " eljamm
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: eljamm @ 2023-03-04 11:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 718 bytes --]

There is a new pull request by eljamm against master on the void-packages repository

https://github.com/eljamm/void-packages yt-dlp-2023.03.03
https://github.com/void-linux/void-packages/pull/42583

yt-dlp: update to 2023.03.03.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
  - armv6l
  - armv6l-musl
  - x86_64-musl

Fixes throttling issues as described in https://github.com/yt-dlp/yt-dlp/issues/6369, https://github.com/yt-dlp/yt-dlp/issues/6400

A patch file from https://github.com/void-linux/void-packages/pull/42583.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yt-dlp-2023.03.03-42583.patch --]
[-- Type: text/x-diff, Size: 1042 bytes --]

From ed20c26118fe19f3fb550764b81823ed2cdd6d3e Mon Sep 17 00:00:00 2001
From: eljamm <83901271+eljamm@users.noreply.github.com>
Date: Sat, 4 Mar 2023 10:40:39 +0100
Subject: [PATCH] yt-dlp: update to 2023.03.03.

---
 srcpkgs/yt-dlp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index 7521ca2d14b1..d395c60417b5 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,6 +1,6 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2023.02.17
+version=2023.03.03
 revision=1
 build_style=python3-module
 make_check_args="-k not(download)"
@@ -13,4 +13,4 @@ license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=81f607b8754b1bc67e6592a4e316c015d720e7118757a5afd4ef2aaf37d2ef29
+checksum=99db0ab54b986aa5c5bb145dc1cf0e516612e61cdb964ee274dddceeceae98a9

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] yt-dlp: update to 2023.03.03.
  2023-03-04 11:04 [PR PATCH] yt-dlp: update to 2023.03.03 eljamm
@ 2023-03-04 12:06 ` eljamm
  2023-03-04 12:17 ` eljamm
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: eljamm @ 2023-03-04 12:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 753 bytes --]

There is an updated pull request by eljamm against master on the void-packages repository

https://github.com/eljamm/void-packages yt-dlp-2023.03.03
https://github.com/void-linux/void-packages/pull/42583

[WIP] yt-dlp: update to 2023.03.03.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
  - armv6l (cross)
  - armv6l-musl (cross)
  - x86_64-musl (cross)

Fixes throttling issues as described in https://github.com/yt-dlp/yt-dlp/issues/6369, https://github.com/yt-dlp/yt-dlp/issues/6400

A patch file from https://github.com/void-linux/void-packages/pull/42583.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yt-dlp-2023.03.03-42583.patch --]
[-- Type: text/x-diff, Size: 5285 bytes --]

From ed20c26118fe19f3fb550764b81823ed2cdd6d3e Mon Sep 17 00:00:00 2001
From: eljamm <83901271+eljamm@users.noreply.github.com>
Date: Sat, 4 Mar 2023 10:40:39 +0100
Subject: [PATCH 1/2] yt-dlp: update to 2023.03.03.

---
 srcpkgs/yt-dlp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index 7521ca2d14b1..d395c60417b5 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,6 +1,6 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2023.02.17
+version=2023.03.03
 revision=1
 build_style=python3-module
 make_check_args="-k not(download)"
@@ -13,4 +13,4 @@ license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=81f607b8754b1bc67e6592a4e316c015d720e7118757a5afd4ef2aaf37d2ef29
+checksum=99db0ab54b986aa5c5bb145dc1cf0e516612e61cdb964ee274dddceeceae98a9

From ba23f32838c6424373594e7541e2cb32df6f24f8 Mon Sep 17 00:00:00 2001
From: eljamm <83901271+eljamm@users.noreply.github.com>
Date: Sat, 4 Mar 2023 12:52:11 +0100
Subject: [PATCH 2/2] mpv: patch to fix yt-dlp fragments

---
 srcpkgs/mpv/patches/fix-ytdl-fragment.patch | 26 +++++++++++++++
 srcpkgs/mpv/patches/ytdl-fragment-log.patch | 37 +++++++++++++++++++++
 srcpkgs/mpv/template                        |  2 +-
 3 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mpv/patches/fix-ytdl-fragment.patch
 create mode 100644 srcpkgs/mpv/patches/ytdl-fragment-log.patch

diff --git a/srcpkgs/mpv/patches/fix-ytdl-fragment.patch b/srcpkgs/mpv/patches/fix-ytdl-fragment.patch
new file mode 100644
index 000000000000..d01421de7ead
--- /dev/null
+++ b/srcpkgs/mpv/patches/fix-ytdl-fragment.patch
@@ -0,0 +1,26 @@
+From 94c189dae76ba280d9883b16346c3dfb9720687e 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] 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 27e5f4544b2..9e50b3a80b8 100644
+--- 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
diff --git a/srcpkgs/mpv/patches/ytdl-fragment-log.patch b/srcpkgs/mpv/patches/ytdl-fragment-log.patch
new file mode 100644
index 000000000000..fb5e8bcec4f7
--- /dev/null
+++ b/srcpkgs/mpv/patches/ytdl-fragment-log.patch
@@ -0,0 +1,37 @@
+From 362256edbc4f95c63e69c1fa8c8dce9cc6c44288 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] 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 9e50b3a80b8..77f7446ed22 100644
+--- 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/srcpkgs/mpv/template b/srcpkgs/mpv/template
index 0a56d037e194..e163c496c6eb 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,7 +1,7 @@
 # Template file for 'mpv'
 pkgname=mpv
 version=0.35.1
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dcdda=enabled -Ddvbin=enabled -Ddvdnav=enabled
  -Dlibmpv=true -Dcplugins=enabled

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [WIP] yt-dlp: update to 2023.03.03.
  2023-03-04 11:04 [PR PATCH] yt-dlp: update to 2023.03.03 eljamm
  2023-03-04 12:06 ` [PR PATCH] [Updated] [WIP] " eljamm
@ 2023-03-04 12:17 ` eljamm
  2023-03-05  9:26 ` eljamm
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: eljamm @ 2023-03-04 12:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 259 bytes --]

New comment by eljamm on void-packages repository

https://github.com/void-linux/void-packages/pull/42583#issuecomment-1454721048

Comment:
Added mpv patch to fix an issue with yt-dlp fragments, which this update causes, and another for related log messages.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [WIP] yt-dlp: update to 2023.03.03.
  2023-03-04 11:04 [PR PATCH] yt-dlp: update to 2023.03.03 eljamm
  2023-03-04 12:06 ` [PR PATCH] [Updated] [WIP] " eljamm
  2023-03-04 12:17 ` eljamm
@ 2023-03-05  9:26 ` eljamm
  2023-03-05 10:09 ` daniel-eys
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: eljamm @ 2023-03-05  9:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 212 bytes --]

New comment by eljamm on void-packages repository

https://github.com/void-linux/void-packages/pull/42583#issuecomment-1455036400

Comment:
I think this is safe to merge, but can anyone else test it to confirm ?

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [WIP] yt-dlp: update to 2023.03.03.
  2023-03-04 11:04 [PR PATCH] yt-dlp: update to 2023.03.03 eljamm
                   ` (2 preceding siblings ...)
  2023-03-05  9:26 ` eljamm
@ 2023-03-05 10:09 ` daniel-eys
  2023-03-05 10:27 ` [PR PATCH] [Updated] " eljamm
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: daniel-eys @ 2023-03-05 10:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 201 bytes --]

New comment by daniel-eys on void-packages repository

https://github.com/void-linux/void-packages/pull/42583#issuecomment-1455045715

Comment:
https://github.com/yt-dlp/yt-dlp/releases/tag/2023.03.04

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] yt-dlp: update to 2023.03.03.
  2023-03-04 11:04 [PR PATCH] yt-dlp: update to 2023.03.03 eljamm
                   ` (3 preceding siblings ...)
  2023-03-05 10:09 ` daniel-eys
@ 2023-03-05 10:27 ` eljamm
  2023-03-06 19:33 ` yt-dlp: update to 2023.03.04 paper42
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: eljamm @ 2023-03-05 10:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 753 bytes --]

There is an updated pull request by eljamm against master on the void-packages repository

https://github.com/eljamm/void-packages yt-dlp-2023.03.03
https://github.com/void-linux/void-packages/pull/42583

[WIP] yt-dlp: update to 2023.03.03.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
  - armv6l (cross)
  - armv6l-musl (cross)
  - x86_64-musl (cross)

Fixes throttling issues as described in https://github.com/yt-dlp/yt-dlp/issues/6369, https://github.com/yt-dlp/yt-dlp/issues/6400

A patch file from https://github.com/void-linux/void-packages/pull/42583.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yt-dlp-2023.03.03-42583.patch --]
[-- Type: text/x-diff, Size: 5285 bytes --]

From 0160eb51cc841db8f3ca838858e13f8489617a47 Mon Sep 17 00:00:00 2001
From: eljamm <83901271+eljamm@users.noreply.github.com>
Date: Sat, 4 Mar 2023 10:40:39 +0100
Subject: [PATCH 1/2] yt-dlp: update to 2023.03.04.

---
 srcpkgs/yt-dlp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index 7521ca2d14b1..a13631631169 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,6 +1,6 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2023.02.17
+version=2023.03.04
 revision=1
 build_style=python3-module
 make_check_args="-k not(download)"
@@ -13,4 +13,4 @@ license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=81f607b8754b1bc67e6592a4e316c015d720e7118757a5afd4ef2aaf37d2ef29
+checksum=771d2abefcd5f1e6f3ab6d6d18cdae98be4ab73538d1174e7e7236640418e150

From 08c7c7dc84f6e1af46e322d0ade5d7c3f6052ee2 Mon Sep 17 00:00:00 2001
From: eljamm <83901271+eljamm@users.noreply.github.com>
Date: Sat, 4 Mar 2023 12:52:11 +0100
Subject: [PATCH 2/2] mpv: patch to fix yt-dlp fragments

---
 srcpkgs/mpv/patches/fix-ytdl-fragment.patch | 26 +++++++++++++++
 srcpkgs/mpv/patches/ytdl-fragment-log.patch | 37 +++++++++++++++++++++
 srcpkgs/mpv/template                        |  2 +-
 3 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mpv/patches/fix-ytdl-fragment.patch
 create mode 100644 srcpkgs/mpv/patches/ytdl-fragment-log.patch

diff --git a/srcpkgs/mpv/patches/fix-ytdl-fragment.patch b/srcpkgs/mpv/patches/fix-ytdl-fragment.patch
new file mode 100644
index 000000000000..d01421de7ead
--- /dev/null
+++ b/srcpkgs/mpv/patches/fix-ytdl-fragment.patch
@@ -0,0 +1,26 @@
+From 94c189dae76ba280d9883b16346c3dfb9720687e 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] 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 27e5f4544b2..9e50b3a80b8 100644
+--- 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
diff --git a/srcpkgs/mpv/patches/ytdl-fragment-log.patch b/srcpkgs/mpv/patches/ytdl-fragment-log.patch
new file mode 100644
index 000000000000..fb5e8bcec4f7
--- /dev/null
+++ b/srcpkgs/mpv/patches/ytdl-fragment-log.patch
@@ -0,0 +1,37 @@
+From 362256edbc4f95c63e69c1fa8c8dce9cc6c44288 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] 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 9e50b3a80b8..77f7446ed22 100644
+--- 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/srcpkgs/mpv/template b/srcpkgs/mpv/template
index 0a56d037e194..e163c496c6eb 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,7 +1,7 @@
 # Template file for 'mpv'
 pkgname=mpv
 version=0.35.1
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dcdda=enabled -Ddvbin=enabled -Ddvdnav=enabled
  -Dlibmpv=true -Dcplugins=enabled

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: yt-dlp: update to 2023.03.04.
  2023-03-04 11:04 [PR PATCH] yt-dlp: update to 2023.03.03 eljamm
                   ` (4 preceding siblings ...)
  2023-03-05 10:27 ` [PR PATCH] [Updated] " eljamm
@ 2023-03-06 19:33 ` paper42
  2023-03-06 19:47 ` [PR PATCH] [Updated] " eljamm
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: paper42 @ 2023-03-06 19:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/42583#issuecomment-1456835203

Comment:
CI is still failing, please look at the message and fix that

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] yt-dlp: update to 2023.03.04.
  2023-03-04 11:04 [PR PATCH] yt-dlp: update to 2023.03.03 eljamm
                   ` (5 preceding siblings ...)
  2023-03-06 19:33 ` yt-dlp: update to 2023.03.04 paper42
@ 2023-03-06 19:47 ` eljamm
  2023-03-06 20:08 ` eljamm
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: eljamm @ 2023-03-06 19:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 747 bytes --]

There is an updated pull request by eljamm against master on the void-packages repository

https://github.com/eljamm/void-packages yt-dlp-2023.03.03
https://github.com/void-linux/void-packages/pull/42583

yt-dlp: update to 2023.03.04.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
  - armv6l (cross)
  - armv6l-musl (cross)
  - x86_64-musl (cross)

Fixes throttling issues as described in https://github.com/yt-dlp/yt-dlp/issues/6369, https://github.com/yt-dlp/yt-dlp/issues/6400

A patch file from https://github.com/void-linux/void-packages/pull/42583.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yt-dlp-2023.03.03-42583.patch --]
[-- Type: text/x-diff, Size: 5259 bytes --]

From 677379b5263cdaea5db0c7f766c5877e192b3a0c Mon Sep 17 00:00:00 2001
From: eljamm <Fedi.Jamoussi@protonmail.ch>
Date: Sat, 4 Mar 2023 10:40:39 +0100
Subject: [PATCH 1/2] yt-dlp: update to 2023.03.04.

---
 srcpkgs/yt-dlp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index 7521ca2d14b1..a13631631169 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,6 +1,6 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2023.02.17
+version=2023.03.04
 revision=1
 build_style=python3-module
 make_check_args="-k not(download)"
@@ -13,4 +13,4 @@ license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=81f607b8754b1bc67e6592a4e316c015d720e7118757a5afd4ef2aaf37d2ef29
+checksum=771d2abefcd5f1e6f3ab6d6d18cdae98be4ab73538d1174e7e7236640418e150

From c9c11631ba0cfef7a6b1a15a4d6e565cb023b53a Mon Sep 17 00:00:00 2001
From: eljamm <Fedi.Jamoussi@protonmail.ch>
Date: Sat, 4 Mar 2023 12:52:11 +0100
Subject: [PATCH 2/2] mpv: patch to fix yt-dlp fragments

---
 srcpkgs/mpv/patches/fix-ytdl-fragment.patch | 26 +++++++++++++++
 srcpkgs/mpv/patches/ytdl-fragment-log.patch | 37 +++++++++++++++++++++
 srcpkgs/mpv/template                        |  2 +-
 3 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mpv/patches/fix-ytdl-fragment.patch
 create mode 100644 srcpkgs/mpv/patches/ytdl-fragment-log.patch

diff --git a/srcpkgs/mpv/patches/fix-ytdl-fragment.patch b/srcpkgs/mpv/patches/fix-ytdl-fragment.patch
new file mode 100644
index 000000000000..d01421de7ead
--- /dev/null
+++ b/srcpkgs/mpv/patches/fix-ytdl-fragment.patch
@@ -0,0 +1,26 @@
+From 94c189dae76ba280d9883b16346c3dfb9720687e 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] 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 27e5f4544b2..9e50b3a80b8 100644
+--- 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
diff --git a/srcpkgs/mpv/patches/ytdl-fragment-log.patch b/srcpkgs/mpv/patches/ytdl-fragment-log.patch
new file mode 100644
index 000000000000..fb5e8bcec4f7
--- /dev/null
+++ b/srcpkgs/mpv/patches/ytdl-fragment-log.patch
@@ -0,0 +1,37 @@
+From 362256edbc4f95c63e69c1fa8c8dce9cc6c44288 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] 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 9e50b3a80b8..77f7446ed22 100644
+--- 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/srcpkgs/mpv/template b/srcpkgs/mpv/template
index 0a56d037e194..e163c496c6eb 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,7 +1,7 @@
 # Template file for 'mpv'
 pkgname=mpv
 version=0.35.1
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dcdda=enabled -Ddvbin=enabled -Ddvdnav=enabled
  -Dlibmpv=true -Dcplugins=enabled

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: yt-dlp: update to 2023.03.04.
  2023-03-04 11:04 [PR PATCH] yt-dlp: update to 2023.03.03 eljamm
                   ` (6 preceding siblings ...)
  2023-03-06 19:47 ` [PR PATCH] [Updated] " eljamm
@ 2023-03-06 20:08 ` eljamm
  2023-03-06 20:15 ` paper42
  2023-03-06 20:15 ` [PR PATCH] [Merged]: " paper42
  9 siblings, 0 replies; 11+ messages in thread
From: eljamm @ 2023-03-06 20:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 164 bytes --]

New comment by eljamm on void-packages repository

https://github.com/void-linux/void-packages/pull/42583#issuecomment-1456894422

Comment:
@paper42 It's good now.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: yt-dlp: update to 2023.03.04.
  2023-03-04 11:04 [PR PATCH] yt-dlp: update to 2023.03.03 eljamm
                   ` (7 preceding siblings ...)
  2023-03-06 20:08 ` eljamm
@ 2023-03-06 20:15 ` paper42
  2023-03-06 20:15 ` [PR PATCH] [Merged]: " paper42
  9 siblings, 0 replies; 11+ messages in thread
From: paper42 @ 2023-03-06 20:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 149 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/42583#issuecomment-1456907484

Comment:
thanks!

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Merged]: yt-dlp: update to 2023.03.04.
  2023-03-04 11:04 [PR PATCH] yt-dlp: update to 2023.03.03 eljamm
                   ` (8 preceding siblings ...)
  2023-03-06 20:15 ` paper42
@ 2023-03-06 20:15 ` paper42
  9 siblings, 0 replies; 11+ messages in thread
From: paper42 @ 2023-03-06 20:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 583 bytes --]

There's a merged pull request on the void-packages repository

yt-dlp: update to 2023.03.04.
https://github.com/void-linux/void-packages/pull/42583

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
  - armv6l (cross)
  - armv6l-musl (cross)
  - x86_64-musl (cross)

Fixes throttling issues as described in https://github.com/yt-dlp/yt-dlp/issues/6369, https://github.com/yt-dlp/yt-dlp/issues/6400

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2023-03-06 20:15 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-04 11:04 [PR PATCH] yt-dlp: update to 2023.03.03 eljamm
2023-03-04 12:06 ` [PR PATCH] [Updated] [WIP] " eljamm
2023-03-04 12:17 ` eljamm
2023-03-05  9:26 ` eljamm
2023-03-05 10:09 ` daniel-eys
2023-03-05 10:27 ` [PR PATCH] [Updated] " eljamm
2023-03-06 19:33 ` yt-dlp: update to 2023.03.04 paper42
2023-03-06 19:47 ` [PR PATCH] [Updated] " eljamm
2023-03-06 20:08 ` eljamm
2023-03-06 20:15 ` paper42
2023-03-06 20:15 ` [PR PATCH] [Merged]: " paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).