Merge remote-tracking branch 'origin/3.6' into 3.7

3 files changed, 16 insertions, 20 deletions

diff --git a/streamlink/.footprint b/streamlink/.footprint
index 9915cdace..caa106699 100644
--- a/streamlink/.footprint
+++ b/streamlink/.footprint
@@ -7,13 +7,13 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/python3.10/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/streamlink-4.2.0.dist-info/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink-4.2.0.dist-info/LICENSE
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink-4.2.0.dist-info/METADATA
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink-4.2.0.dist-info/RECORD
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink-4.2.0.dist-info/WHEEL
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink-4.2.0.dist-info/entry_points.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink-4.2.0.dist-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/streamlink-4.3.0.dist-info/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink-4.3.0.dist-info/LICENSE
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink-4.3.0.dist-info/METADATA
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink-4.3.0.dist-info/RECORD
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink-4.3.0.dist-info/WHEEL
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink-4.3.0.dist-info/entry_points.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink-4.3.0.dist-info/top_level.txt
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/streamlink/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/__init__.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/__main__.py
@@ -84,6 +84,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycac
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/ard_live.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/ard_mediathek.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/artetv.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/atpchallenger.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/atresplayer.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/bbciplayer.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/bfmtv.cpython-310.opt-2.pyc
@@ -101,7 +102,6 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycac
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/clubbingtv.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/cmmedia.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/cnews.cpython-310.opt-2.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/common_jwplayer.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/crunchyroll.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/dailymotion.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/dash.cpython-310.opt-2.pyc
@@ -145,9 +145,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycac
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/mjunoon.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/mrtmk.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/n13tv.cpython-310.opt-2.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/nbc.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/nbcnews.cpython-310.opt-2.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/nbcsports.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/nhkworld.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/nicolive.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/nimotv.cpython-310.opt-2.pyc
@@ -193,7 +191,6 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycac
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/swisstxt.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/telefe.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/tf1.cpython-310.opt-2.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/theplatform.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/trovo.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/turkuvaz.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycache__/tv360.cpython-310.opt-2.pyc
@@ -239,6 +236,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycac
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/ard_live.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/ard_mediathek.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/artetv.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/atpchallenger.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/atresplayer.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/bbciplayer.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/bfmtv.py
@@ -256,7 +254,6 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycac
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/clubbingtv.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/cmmedia.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/cnews.py
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/common_jwplayer.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/crunchyroll.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/dailymotion.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/dash.py
@@ -300,9 +297,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycac
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/mjunoon.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/mrtmk.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/n13tv.py
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/nbc.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/nbcnews.py
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/nbcsports.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/nhkworld.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/nicolive.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/nimotv.py
@@ -348,7 +343,6 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/__pycac
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/swisstxt.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/telefe.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/tf1.py
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/theplatform.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/trovo.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/turkuvaz.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink/plugins/tv360.py
@@ -463,11 +457,13 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/streamlink_cli/utils/__pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink_cli/utils/__pycache__/path.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink_cli/utils/__pycache__/player.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink_cli/utils/__pycache__/progress.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink_cli/utils/__pycache__/terminal.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink_cli/utils/formatter.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink_cli/utils/http_server.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink_cli/utils/path.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink_cli/utils/player.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink_cli/utils/progress.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/streamlink_cli/utils/terminal.py
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/bash-completion/
 drwxr-xr-x	root/root	usr/share/bash-completion/completions/
diff --git a/streamlink/.signature b/streamlink/.signature
index 00a01e927..5e57e97c2 100644
--- a/streamlink/.signature
+++ b/streamlink/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF32MmXXTrWGz9a29hMKPOEcgiqyO94hmORQG4QLqknThhRpGyqpxg1MTHMpfu8yOqYdsFVK8T9UkHcUlhz3zeuAg=
-SHA256 (Pkgfile) = be2f86ae4fb52267117559ed29fa99d037fe658214f13065e648180eb854de30
-SHA256 (.footprint) = e82f880dcf4b25b4de88de4925ce14048aa34807f28aaf2a93138bd3b4d83c28
-SHA256 (streamlink-4.2.0.tar.gz) = 8e745c4b91f1cc3789c619ac8dadbd461c10a66a73b70453e1d5dfa03f5bd6e4
+RWSagIOpLGJF35sjoh3vhEyP9reVWR0lec6ELSNwKuyrMfXzYhj0o/lzsAbma803gjLAGPoyjgDd9stqFll+Sc6b+P9j6uhTAgk=
+SHA256 (Pkgfile) = cd67f3d2b4ec2cab130d3b686d482fa5384ac015b57551d2a367c57b49234dac
+SHA256 (.footprint) = 8777fcc91bff86c8484cc4a82e63759345fda13a4d7f7a1eadd6fa0ac9a4df56
+SHA256 (streamlink-4.3.0.tar.gz) = 49ab4f38f11308656e8cd241dff85fcc224bc2ff184e263ddbf6c74243f67d1f
diff --git a/streamlink/Pkgfile b/streamlink/Pkgfile
index 21c1bf309..954b85086 100644
--- a/streamlink/Pkgfile
+++ b/streamlink/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: python3-iso-639 python3-iso3166 python3-isodate python3-pycountry python3-pycryptodome python3-pysocks python3-requests python3-versioningit python3-websocket-client
 
 name=streamlink
-version=4.2.0
+version=4.3.0
 release=1
 source=(https://files.pythonhosted.org/packages/source/${name:0:1}/$name/$name-$version.tar.gz)