4 files changed, 75 insertions, 200 deletions

diff --git a/multimedia/emby-server/Makefile b/multimedia/emby-server/Makefile
index 07cfdb722487..3935063e254c 100644
--- a/multimedia/emby-server/Makefile
+++ b/multimedia/emby-server/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	emby-server
-DISTVERSION=	4.6.7.0
-PORTREVISION=	2
+DISTVERSION=	4.7.1.0
 CATEGORIES=	multimedia
 MASTER_SITES=	https://github.com/MediaBrowser/Emby.Releases/releases/download/${PORTVERSION}/ \
 		https://mediabrowser.github.io/embytools/
@@ -27,6 +26,7 @@ ONLY_FOR_ARCHS=	amd64
 BUILD_DEPENDS=	nasm:devel/nasm
 LIB_DEPENDS=	libaribb24.so:multimedia/aribb24 \
 		libass.so:multimedia/libass \
+		libchromaprint.so:audio/chromaprint \
 		libdav1d.so:multimedia/dav1d \
 		libdrm.so:graphics/libdrm \
 		libfontconfig.so:x11-fonts/fontconfig \
@@ -38,6 +38,7 @@ LIB_DEPENDS=	libaribb24.so:multimedia/aribb24 \
 		libopus.so:audio/opus \
 		libpng.so:graphics/png \
 		libraw.so:graphics/libraw \
+		libtesseract.so:graphics/tesseract \
 		libtheora.so:multimedia/libtheora \
 		libva.so:multimedia/libva \
 		libvorbis.so:audio/libvorbis \
@@ -64,6 +65,7 @@ CONFIGURE_ARGS=	--cc="${CC}" \
 		--disable-v4l2-m2m \
 		--disable-vdpau \
 		--disable-xlib \
+		--enable-chromaprint \
 		--enable-fontconfig \
 		--enable-gnutls \
 		--enable-gpl \
@@ -76,6 +78,7 @@ CONFIGURE_ARGS=	--cc="${CC}" \
 		--enable-libfribidi \
 		--enable-libmfx \
 		--enable-libopus \
+		--enable-libtesseract \
 		--enable-libtheora \
 		--enable-libvorbis \
 		--enable-libvpx \
@@ -115,7 +118,7 @@ X11_USES=		xorg magick:6
 X11_USES_OFF=		magick:6,nox11
 X11_USE=		xorg=x11
 
-FFVERSION=	2021_02_27
+FFVERSION=	2022_05_07
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/emby-server/system
diff --git a/multimedia/emby-server/distinfo b/multimedia/emby-server/distinfo
index 379d96851b41..99bbdb43f7d3 100644
--- a/multimedia/emby-server/distinfo
+++ b/multimedia/emby-server/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1637602214
-SHA256 (emby-server/embyserver-netframework_4.6.7.0.zip) = 94c0c90998d676cbc8251d37b882f180cb0839f24f23cd7cf2967b84b5871e2e
-SIZE (emby-server/embyserver-netframework_4.6.7.0.zip) = 48266548
-SHA256 (emby-server/ffdetect-2021_02_27-x64_freebsd13.tar.xz) = 883e02378da5f111931e36226fe85bcf19deeaaf4ede446e267081838e936ac7
-SIZE (emby-server/ffdetect-2021_02_27-x64_freebsd13.tar.xz) = 75244
-SHA256 (emby-server/ffmpeg-2021_02_27.tar.gz) = dd587ddbde4c967695919d7f85b0f28e6d7262f55171f3e8052eef2f4a7f585c
-SIZE (emby-server/ffmpeg-2021_02_27.tar.gz) = 13236851
+TIMESTAMP = 1653530711
+SHA256 (emby-server/embyserver-netframework_4.7.1.0.zip) = 4b7ce95df337379dae59af8d81c15e6aad4774dbe7dc3983b111fc7e39a37077
+SIZE (emby-server/embyserver-netframework_4.7.1.0.zip) = 48572134
+SHA256 (emby-server/ffdetect-2022_05_07-x64_freebsd13.tar.xz) = 88e82f76e5e82568bdd7800ec5c6d5c05d33c4c951dae0712d078112cee80e64
+SIZE (emby-server/ffdetect-2022_05_07-x64_freebsd13.tar.xz) = 75308
+SHA256 (emby-server/ffmpeg-2022_05_07.tar.gz) = 44506c7c4fa41c721819f9b530b021e11921ea2a1332ce947d8af5a06a2df01e
+SIZE (emby-server/ffmpeg-2022_05_07.tar.gz) = 14301915
 SHA256 (emby-server/license.docx) = a6d7ea65dcb06392479a85e1a10a7aeb872d803da6f784f6935fcd4ee63008c6
 SIZE (emby-server/license.docx) = 18373
diff --git a/multimedia/emby-server/files/patch-dav1d-1.0 b/multimedia/emby-server/files/patch-dav1d-1.0
deleted file mode 100644
index 1c4ca68a21f9..000000000000
--- a/multimedia/emby-server/files/patch-dav1d-1.0
+++ /dev/null
@@ -1,111 +0,0 @@
-https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/5e61fce832f7
-
-libavcodec/libdav1d.c:137:7: error: no member named 'n_tile_threads' in 'struct Dav1dSettings'
-    s.n_tile_threads = dav1d->tile_threads
-    ~ ^
-libavcodec/libdav1d.c:139:52: error: use of undeclared identifier 'DAV1D_MAX_TILE_THREADS'
-                     : FFMIN(floor(sqrt(threads)), DAV1D_MAX_TILE_THREADS);
-                                                   ^
-libavcodec/libdav1d.c:139:52: error: use of undeclared identifier 'DAV1D_MAX_TILE_THREADS'
-libavcodec/libdav1d.c:140:7: error: no member named 'n_frame_threads' in 'struct Dav1dSettings'
-    s.n_frame_threads = dav1d->frame_threads
-    ~ ^
-libavcodec/libdav1d.c:142:48: error: no member named 'n_tile_threads' in 'struct Dav1dSettings'
-                      : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS);
-                                             ~ ^
-./libavutil/common.h:96:22: note: expanded from macro 'FFMIN'
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
-                     ^
-libavcodec/libdav1d.c:142:65: error: use of undeclared identifier 'DAV1D_MAX_FRAME_THREADS'; did you mean 'DAV1D_OBU_FRAME_HDR'?
-                      : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS);
-                                                                ^~~~~~~~~~~~~~~~~~~~~~~
-                                                                DAV1D_OBU_FRAME_HDR
-./libavutil/common.h:96:28: note: expanded from macro 'FFMIN'
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
-                           ^
-/usr/local/include/dav1d/headers.h:48:5: note: 'DAV1D_OBU_FRAME_HDR' declared here
-    DAV1D_OBU_FRAME_HDR = 3,
-    ^
-libavcodec/libdav1d.c:142:65: error: use of undeclared identifier 'DAV1D_MAX_FRAME_THREADS'; did you mean 'DAV1D_OBU_FRAME_HDR'?
-                      : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS);
-                                                                ^~~~~~~~~~~~~~~~~~~~~~~
-                                                                DAV1D_OBU_FRAME_HDR
-./libavutil/common.h:96:34: note: expanded from macro 'FFMIN'
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
-                                 ^
-/usr/local/include/dav1d/headers.h:48:5: note: 'DAV1D_OBU_FRAME_HDR' declared here
-    DAV1D_OBU_FRAME_HDR = 3,
-    ^
-libavcodec/libdav1d.c:142:48: error: no member named 'n_tile_threads' in 'struct Dav1dSettings'
-                      : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS);
-                                             ~ ^
-./libavutil/common.h:96:40: note: expanded from macro 'FFMIN'
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
-                                       ^
-libavcodec/libdav1d.c:144:14: error: no member named 'n_frame_threads' in 'struct Dav1dSettings'
-           s.n_frame_threads, s.n_tile_threads);
-           ~ ^
-libavcodec/libdav1d.c:144:33: error: no member named 'n_tile_threads' in 'struct Dav1dSettings'
-           s.n_frame_threads, s.n_tile_threads);
-                              ~ ^
-libavcodec/libdav1d.c:378:94: error: use of undeclared identifier 'DAV1D_MAX_TILE_THREADS'
-    { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD },
-                                                                                             ^
-libavcodec/libdav1d.c:379:97: error: use of undeclared identifier 'DAV1D_MAX_FRAME_THREADS'; did you mean 'DAV1D_OBU_FRAME_HDR'?
-    { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD },
-                                                                                                ^~~~~~~~~~~~~~~~~~~~~~~
-                                                                                                DAV1D_OBU_FRAME_HDR
-/usr/local/include/dav1d/headers.h:48:5: note: 'DAV1D_OBU_FRAME_HDR' declared here
-    DAV1D_OBU_FRAME_HDR = 3,
-    ^
-
---- libavcodec/libdav1d.c.orig	2021-05-11 03:40:43 UTC
-+++ libavcodec/libdav1d.c
-@@ -30,6 +30,9 @@
- #include "decode.h"
- #include "internal.h"
- 
-+#define FF_DAV1D_VERSION_AT_LEAST(x,y) \
-+    (DAV1D_API_VERSION_MAJOR > (x) || DAV1D_API_VERSION_MAJOR == (x) && DAV1D_API_VERSION_MINOR >= (y))
-+
- typedef struct Libdav1dContext {
-     AVClass *class;
-     Dav1dContext *c;
-@@ -134,6 +137,15 @@ static av_cold int libdav1d_init(AVCodecContext *c)
-     if (dav1d->apply_grain >= 0)
-         s.apply_grain = dav1d->apply_grain;
- 
-+#if FF_DAV1D_VERSION_AT_LEAST(6,0)
-+    if (dav1d->frame_threads || dav1d->tile_threads)
-+        s.n_threads = FFMAX(dav1d->frame_threads, dav1d->tile_threads);
-+    else
-+        s.n_threads = FFMIN(threads, DAV1D_MAX_THREADS);
-+    s.max_frame_delay = (c->flags & AV_CODEC_FLAG_LOW_DELAY) ? 1 : s.n_threads;
-+    av_log(c, AV_LOG_DEBUG, "Using %d threads, %d max_frame_delay\n",
-+           s.n_threads, s.max_frame_delay);
-+#else
-     s.n_tile_threads = dav1d->tile_threads
-                      ? dav1d->tile_threads
-                      : FFMIN(floor(sqrt(threads)), DAV1D_MAX_TILE_THREADS);
-@@ -142,6 +154,7 @@ static av_cold int libdav1d_init(AVCodecContext *c)
-                       : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS);
-     av_log(c, AV_LOG_DEBUG, "Using %d frame threads, %d tile threads\n",
-            s.n_frame_threads, s.n_tile_threads);
-+#endif
- 
-     res = dav1d_open(&dav1d->c, &s);
-     if (res < 0)
-@@ -371,6 +384,13 @@ static av_cold int libdav1d_close(AVCodecContext *c)
- 
-     return 0;
- }
-+
-+#ifndef DAV1D_MAX_FRAME_THREADS
-+#define DAV1D_MAX_FRAME_THREADS DAV1D_MAX_THREADS
-+#endif
-+#ifndef DAV1D_MAX_TILE_THREADS
-+#define DAV1D_MAX_TILE_THREADS DAV1D_MAX_THREADS
-+#endif
- 
- #define OFFSET(x) offsetof(Libdav1dContext, x)
- #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
diff --git a/multimedia/emby-server/pkg-plist b/multimedia/emby-server/pkg-plist
index ed001cd3bd91..e9aa1262be53 100644
--- a/multimedia/emby-server/pkg-plist
+++ b/multimedia/emby-server/pkg-plist
@@ -61,6 +61,7 @@ lib/emby-server/system/MediaBrowser.Controller.pdb
 lib/emby-server/system/MediaBrowser.Model.dll
 lib/emby-server/system/MediaBrowser.Model.pdb
 lib/emby-server/system/Microsoft.Bcl.AsyncInterfaces.dll
+lib/emby-server/system/Microsoft.Bcl.HashCode.dll
 lib/emby-server/system/Microsoft.Extensions.Configuration.Abstractions.dll
 lib/emby-server/system/Microsoft.Extensions.Configuration.Binder.dll
 lib/emby-server/system/Microsoft.Extensions.Configuration.CommandLine.dll
@@ -119,7 +120,6 @@ lib/emby-server/system/System.Data.Common.dll
 lib/emby-server/system/System.Diagnostics.Contracts.dll
 lib/emby-server/system/System.Diagnostics.Debug.dll
 lib/emby-server/system/System.Diagnostics.DiagnosticSource.dll
-lib/emby-server/system/System.Diagnostics.EventLog.dll
 lib/emby-server/system/System.Diagnostics.FileVersionInfo.dll
 lib/emby-server/system/System.Diagnostics.Process.dll
 lib/emby-server/system/System.Diagnostics.StackTrace.dll
@@ -186,9 +186,9 @@ lib/emby-server/system/System.Security.Cryptography.Csp.dll
 lib/emby-server/system/System.Security.Cryptography.Encoding.dll
 lib/emby-server/system/System.Security.Cryptography.Primitives.dll
 lib/emby-server/system/System.Security.Cryptography.X509Certificates.dll
-lib/emby-server/system/System.Security.Principal.Windows.dll
 lib/emby-server/system/System.Security.Principal.dll
 lib/emby-server/system/System.Security.SecureString.dll
+lib/emby-server/system/System.Text.Encoding.CodePages.dll
 lib/emby-server/system/System.Text.Encoding.Extensions.dll
 lib/emby-server/system/System.Text.Encoding.dll
 lib/emby-server/system/System.Text.Encodings.Web.dll
@@ -214,43 +214,24 @@ lib/emby-server/system/arm64/libSkiaSharp.dll
 lib/emby-server/system/dashboard-ui/apikeys/apikeys.js
 lib/emby-server/system/dashboard-ui/app.js
 lib/emby-server/system/dashboard-ui/apploader.js
-lib/emby-server/system/dashboard-ui/bower_components/Swiper/dist/css/swiper.min.css
-lib/emby-server/system/dashboard-ui/bower_components/Swiper/dist/js/swiper.min.js
 lib/emby-server/system/dashboard-ui/bower_components/abortcontroller-polyfill/umd-polyfill.js
-lib/emby-server/system/dashboard-ui/bower_components/alameda/alameda.js
-lib/emby-server/system/dashboard-ui/bower_components/css-vars-ponyfill/css-vars-ponyfill.min.js
-lib/emby-server/system/dashboard-ui/bower_components/document-register-element/custom-elements-builtin.js
-lib/emby-server/system/dashboard-ui/bower_components/document-register-element/document-register-element.js
-lib/emby-server/system/dashboard-ui/bower_components/emby-apiclient/apiclient.js
-lib/emby-server/system/dashboard-ui/bower_components/emby-apiclient/apiclientex.js
-lib/emby-server/system/dashboard-ui/bower_components/emby-apiclient/appstorage-cache.js
-lib/emby-server/system/dashboard-ui/bower_components/emby-apiclient/appstorage-localstorage.js
-lib/emby-server/system/dashboard-ui/bower_components/emby-apiclient/appstorage-memory.js
-lib/emby-server/system/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js
-lib/emby-server/system/dashboard-ui/bower_components/emby-apiclient/credentials.js
-lib/emby-server/system/dashboard-ui/bower_components/emby-apiclient/events.js
-lib/emby-server/system/dashboard-ui/bower_components/emby-apiclient/serverdiscovery.js
-lib/emby-server/system/dashboard-ui/bower_components/emby-apiclient/wakeonlan.js
+lib/emby-server/system/dashboard-ui/bower_components/css-vars-ponyfill/css-vars-ponyfill.js
 lib/emby-server/system/dashboard-ui/bower_components/fetch/fetch.js
-lib/emby-server/system/dashboard-ui/bower_components/howlerjs/dist/howler.min.js
 lib/emby-server/system/dashboard-ui/bower_components/javascriptsubtitlesoctopus/dist/subtitles-octopus-worker-legacy.js
 lib/emby-server/system/dashboard-ui/bower_components/javascriptsubtitlesoctopus/dist/subtitles-octopus-worker-legacy.js.mem
 lib/emby-server/system/dashboard-ui/bower_components/javascriptsubtitlesoctopus/dist/subtitles-octopus-worker.js
 lib/emby-server/system/dashboard-ui/bower_components/javascriptsubtitlesoctopus/dist/subtitles-octopus-worker.wasm
 lib/emby-server/system/dashboard-ui/bower_components/javascriptsubtitlesoctopus/dist/subtitles-octopus.js
-lib/emby-server/system/dashboard-ui/bower_components/jquery/dist/jquery.slim.min.js
+lib/emby-server/system/dashboard-ui/bower_components/jquery/jquery-slim.js
 lib/emby-server/system/dashboard-ui/bower_components/jstree/jstree.js
 lib/emby-server/system/dashboard-ui/bower_components/jstree/themes/default/32px.png
 lib/emby-server/system/dashboard-ui/bower_components/jstree/themes/default/style.css
 lib/emby-server/system/dashboard-ui/bower_components/jstree/themes/default/throbber.gif
 lib/emby-server/system/dashboard-ui/bower_components/libjass/libjass.css
 lib/emby-server/system/dashboard-ui/bower_components/libjass/libjass.js
-lib/emby-server/system/dashboard-ui/bower_components/modernizr/modernizr.min.js
-lib/emby-server/system/dashboard-ui/bower_components/query-string/index.js
 lib/emby-server/system/dashboard-ui/components/accessschedule/accessschedule.js
 lib/emby-server/system/dashboard-ui/components/accessschedule/accessschedule.template.html
 lib/emby-server/system/dashboard-ui/components/activitylog.js
-lib/emby-server/system/dashboard-ui/components/channelmapper/channelmapper.js
 lib/emby-server/system/dashboard-ui/components/directorybrowser/directorybrowser.css
 lib/emby-server/system/dashboard-ui/components/directorybrowser/directorybrowser.js
 lib/emby-server/system/dashboard-ui/components/imageoptionseditor/imageoptionseditor.js
@@ -263,9 +244,7 @@ lib/emby-server/system/dashboard-ui/components/medialibraryeditor/medialibraryed
 lib/emby-server/system/dashboard-ui/components/medialibraryeditor/medialibraryeditor.template.html
 lib/emby-server/system/dashboard-ui/components/tunerpicker.js
 lib/emby-server/system/dashboard-ui/css/detailtable.css
-lib/emby-server/system/dashboard-ui/css/images/supporter/premiumflag.png
 lib/emby-server/system/dashboard-ui/css/images/supporter/supporterbadge.png
-lib/emby-server/system/dashboard-ui/css/images/supporter/supporterflag.png
 lib/emby-server/system/dashboard-ui/dashboard/aboutpage.js
 lib/emby-server/system/dashboard-ui/dashboard/dashboard.css
 lib/emby-server/system/dashboard-ui/dashboard/dashboard.html
@@ -297,8 +276,6 @@ lib/emby-server/system/dashboard-ui/home_horiz/home.html
 lib/emby-server/system/dashboard-ui/home_horiz/home.js
 lib/emby-server/system/dashboard-ui/home_horiz/spotlight.js
 lib/emby-server/system/dashboard-ui/home_horiz/tabbedpage.js
-lib/emby-server/system/dashboard-ui/home_horiz/views.channels.html
-lib/emby-server/system/dashboard-ui/home_horiz/views.channels.js
 lib/emby-server/system/dashboard-ui/home_horiz/views.generic.html
 lib/emby-server/system/dashboard-ui/home_horiz/views.generic.js
 lib/emby-server/system/dashboard-ui/home_horiz/views.livetv.html
@@ -364,6 +341,7 @@ lib/emby-server/system/dashboard-ui/metadatamanager/metadatamanagersidebar.js
 lib/emby-server/system/dashboard-ui/modules/actionsheet/actionsheet.css
 lib/emby-server/system/dashboard-ui/modules/actionsheet/actionsheet.js
 lib/emby-server/system/dashboard-ui/modules/addtolist/addtolist.js
+lib/emby-server/system/dashboard-ui/modules/alameda/alameda.js
 lib/emby-server/system/dashboard-ui/modules/alphanumericshortcuts/alphanumericshortcuts.css
 lib/emby-server/system/dashboard-ui/modules/alphanumericshortcuts/alphanumericshortcuts.js
 lib/emby-server/system/dashboard-ui/modules/alphapicker/alphapicker.js
@@ -372,44 +350,42 @@ lib/emby-server/system/dashboard-ui/modules/appfooter/appfooter.css
 lib/emby-server/system/dashboard-ui/modules/appfooter/appfooter.js
 lib/emby-server/system/dashboard-ui/modules/appheader/appheader.css
 lib/emby-server/system/dashboard-ui/modules/appheader/appheader.js
-lib/emby-server/system/dashboard-ui/modules/appheader/appheader.template.html
+lib/emby-server/system/dashboard-ui/modules/approuter.js
 lib/emby-server/system/dashboard-ui/modules/autobackdrops.js
 lib/emby-server/system/dashboard-ui/modules/babelhelpers.js
 lib/emby-server/system/dashboard-ui/modules/backdrop/backdrop.js
 lib/emby-server/system/dashboard-ui/modules/backdrop/style.css
 lib/emby-server/system/dashboard-ui/modules/backdropscreensaver/plugin.js
-lib/emby-server/system/dashboard-ui/modules/backmenu/backmenu.css
 lib/emby-server/system/dashboard-ui/modules/backmenu/backmenu.js
 lib/emby-server/system/dashboard-ui/modules/browser.js
 lib/emby-server/system/dashboard-ui/modules/browserdeviceprofile.js
 lib/emby-server/system/dashboard-ui/modules/cardbuilder/card.css
 lib/emby-server/system/dashboard-ui/modules/cardbuilder/cardbuilder.js
-lib/emby-server/system/dashboard-ui/modules/cardbuilder/roundcard.css
 lib/emby-server/system/dashboard-ui/modules/chromecast/chromecasthelpers.js
 lib/emby-server/system/dashboard-ui/modules/chromecast/chromecastplayer.js
-lib/emby-server/system/dashboard-ui/modules/clearbutton.css
 lib/emby-server/system/dashboard-ui/modules/commandprocessor.js
-lib/emby-server/system/dashboard-ui/modules/common/alert/alert.js
 lib/emby-server/system/dashboard-ui/modules/common/appsettings.js
-lib/emby-server/system/dashboard-ui/modules/common/confirm/confirm.js
 lib/emby-server/system/dashboard-ui/modules/common/datetime.js
 lib/emby-server/system/dashboard-ui/modules/common/deletehelper.js
+lib/emby-server/system/dashboard-ui/modules/common/dialogs/alert.js
+lib/emby-server/system/dashboard-ui/modules/common/dialogs/confirm.js
 lib/emby-server/system/dashboard-ui/modules/common/filesystem.js
 lib/emby-server/system/dashboard-ui/modules/common/globalize.js
 lib/emby-server/system/dashboard-ui/modules/common/input/api.js
 lib/emby-server/system/dashboard-ui/modules/common/inputmanager.js
 lib/emby-server/system/dashboard-ui/modules/common/itemhelper.js
 lib/emby-server/system/dashboard-ui/modules/common/itemsrefresher.js
+lib/emby-server/system/dashboard-ui/modules/common/methodtimer.js
 lib/emby-server/system/dashboard-ui/modules/common/playback/experimentalwarnings.js
 lib/emby-server/system/dashboard-ui/modules/common/playback/playaccessvalidation.js
 lib/emby-server/system/dashboard-ui/modules/common/playback/playbackmanager.js
 lib/emby-server/system/dashboard-ui/modules/common/playback/playbackvalidation.js
-lib/emby-server/system/dashboard-ui/modules/common/playback/playmethodhelper.js
 lib/emby-server/system/dashboard-ui/modules/common/playback/playqueueconfirmation.js
 lib/emby-server/system/dashboard-ui/modules/common/playback/playqueuemanager.js
 lib/emby-server/system/dashboard-ui/modules/common/pluginmanager.js
 lib/emby-server/system/dashboard-ui/modules/common/qualityoptions.js
-lib/emby-server/system/dashboard-ui/modules/common/recordingcreator/recordinghelper.js
+lib/emby-server/system/dashboard-ui/modules/common/recordinghelper.js
+lib/emby-server/system/dashboard-ui/modules/common/servicelocator.js
 lib/emby-server/system/dashboard-ui/modules/common/strings/ar.json
 lib/emby-server/system/dashboard-ui/modules/common/strings/bg-BG.json
 lib/emby-server/system/dashboard-ui/modules/common/strings/ca.json
@@ -453,12 +429,12 @@ lib/emby-server/system/dashboard-ui/modules/common/strings/vi.json
 lib/emby-server/system/dashboard-ui/modules/common/strings/zh-CN.json
 lib/emby-server/system/dashboard-ui/modules/common/strings/zh-HK.json
 lib/emby-server/system/dashboard-ui/modules/common/strings/zh-TW.json
-lib/emby-server/system/dashboard-ui/modules/common/subtitlesettings/subtitleappearancehelper.js
+lib/emby-server/system/dashboard-ui/modules/common/subtitleappearancehelper.js
+lib/emby-server/system/dashboard-ui/modules/common/textencoding.js
 lib/emby-server/system/dashboard-ui/modules/common/usersettings/usersettings.js
 lib/emby-server/system/dashboard-ui/modules/common/usersettings/usersettingsbuilder.js
 lib/emby-server/system/dashboard-ui/modules/confirmstillplaying/plugin.js
 lib/emby-server/system/dashboard-ui/modules/controlbox.js
-lib/emby-server/system/dashboard-ui/modules/detailbuttons.css
 lib/emby-server/system/dashboard-ui/modules/dialog/dialog.js
 lib/emby-server/system/dashboard-ui/modules/dialog/dialog.template.html
 lib/emby-server/system/dashboard-ui/modules/dialoghelper/dialoghelper.css
@@ -466,6 +442,16 @@ lib/emby-server/system/dashboard-ui/modules/dialoghelper/dialoghelper.js
 lib/emby-server/system/dashboard-ui/modules/dockedtabs/dockedtabs.css
 lib/emby-server/system/dashboard-ui/modules/dockedtabs/dockedtabs.js
 lib/emby-server/system/dashboard-ui/modules/dom.js
+lib/emby-server/system/dashboard-ui/modules/emby-apiclient/apiclient.js
+lib/emby-server/system/dashboard-ui/modules/emby-apiclient/apiclientex.js
+lib/emby-server/system/dashboard-ui/modules/emby-apiclient/appstorage-cache.js
+lib/emby-server/system/dashboard-ui/modules/emby-apiclient/appstorage-localstorage.js
+lib/emby-server/system/dashboard-ui/modules/emby-apiclient/appstorage-memory.js
+lib/emby-server/system/dashboard-ui/modules/emby-apiclient/connectionmanager.js
+lib/emby-server/system/dashboard-ui/modules/emby-apiclient/credentials.js
+lib/emby-server/system/dashboard-ui/modules/emby-apiclient/events.js
+lib/emby-server/system/dashboard-ui/modules/emby-apiclient/serverdiscovery.js
+lib/emby-server/system/dashboard-ui/modules/emby-apiclient/wakeonlan.js
 lib/emby-server/system/dashboard-ui/modules/emby-connect/connecthelper.js
 lib/emby-server/system/dashboard-ui/modules/emby-elements/emby-button/emby-button.css
 lib/emby-server/system/dashboard-ui/modules/emby-elements/emby-button/emby-button.js
@@ -482,7 +468,6 @@ lib/emby-server/system/dashboard-ui/modules/emby-elements/emby-progressbar/emby-
 lib/emby-server/system/dashboard-ui/modules/emby-elements/emby-progressbar/emby-progressbar.js
 lib/emby-server/system/dashboard-ui/modules/emby-elements/emby-progressring/emby-progressring.css
 lib/emby-server/system/dashboard-ui/modules/emby-elements/emby-progressring/emby-progressring.js
-lib/emby-server/system/dashboard-ui/modules/emby-elements/emby-progressring/emby-progressring.template.html
 lib/emby-server/system/dashboard-ui/modules/emby-elements/emby-radio/emby-radio.css
 lib/emby-server/system/dashboard-ui/modules/emby-elements/emby-radio/emby-radio.js
 lib/emby-server/system/dashboard-ui/modules/emby-elements/emby-scrollbuttons/emby-scrollbuttons.css
@@ -586,8 +571,8 @@ lib/emby-server/system/dashboard-ui/modules/flvjs/utils/logging-control.js
 lib/emby-server/system/dashboard-ui/modules/flvjs/utils/utf8-conv.js
 lib/emby-server/system/dashboard-ui/modules/focusmanager.js
 lib/emby-server/system/dashboard-ui/modules/fonts/fonts.css
-lib/emby-server/system/dashboard-ui/modules/fonts/material-icons/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmJ_1.woff
-lib/emby-server/system/dashboard-ui/modules/fonts/material-icons/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP_1.woff2
+lib/emby-server/system/dashboard-ui/modules/fonts/material-icons/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmJ_3.woff
+lib/emby-server/system/dashboard-ui/modules/fonts/material-icons/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP_3.woff2
 lib/emby-server/system/dashboard-ui/modules/fonts/material-icons/style.css
 lib/emby-server/system/dashboard-ui/modules/fonts/roboto/KFOlCnqEu92Fr1MmEU9fABc4EsA.woff2
 lib/emby-server/system/dashboard-ui/modules/fonts/roboto/KFOlCnqEu92Fr1MmEU9fBBc4.woff2
@@ -619,12 +604,12 @@ lib/emby-server/system/dashboard-ui/modules/headroom/headroom.css
 lib/emby-server/system/dashboard-ui/modules/headroom/headroom.js
 lib/emby-server/system/dashboard-ui/modules/hlsjs/hls.min.js
 lib/emby-server/system/dashboard-ui/modules/homesections/homesections.js
+lib/emby-server/system/dashboard-ui/modules/howlerjs/howler.core.js
 lib/emby-server/system/dashboard-ui/modules/htmlaudioplayer/plugin.js
 lib/emby-server/system/dashboard-ui/modules/htmlvideoplayer/basehtmlplayer.js
 lib/emby-server/system/dashboard-ui/modules/htmlvideoplayer/htmlmediahelper.js
 lib/emby-server/system/dashboard-ui/modules/htmlvideoplayer/plugin.js
 lib/emby-server/system/dashboard-ui/modules/htmlvideoplayer/style.css
-lib/emby-server/system/dashboard-ui/modules/htmlvideoplayer/vtt.min.js
 lib/emby-server/system/dashboard-ui/modules/humanedate/humanedate.js
 lib/emby-server/system/dashboard-ui/modules/iap.js
 lib/emby-server/system/dashboard-ui/modules/imagedownloader/imagedownloader.js
@@ -646,14 +631,10 @@ lib/emby-server/system/dashboard-ui/modules/itemidentifier/itemidentifier.templa
 lib/emby-server/system/dashboard-ui/modules/layout.css
 lib/emby-server/system/dashboard-ui/modules/layoutmanager.js
 lib/emby-server/system/dashboard-ui/modules/lazyloader/lazyloader-intersectionobserver.js
-lib/emby-server/system/dashboard-ui/modules/lazyloader/lazyloader-scroll.js
 lib/emby-server/system/dashboard-ui/modules/listview/listview.css
 lib/emby-server/system/dashboard-ui/modules/listview/listview.js
-lib/emby-server/system/dashboard-ui/modules/loading/loader2.gif
-lib/emby-server/system/dashboard-ui/modules/loading/loading-legacy.css
-lib/emby-server/system/dashboard-ui/modules/loading/loading-legacy.js
-lib/emby-server/system/dashboard-ui/modules/loading/loading-lite.css
-lib/emby-server/system/dashboard-ui/modules/loading/loading-lite.js
+lib/emby-server/system/dashboard-ui/modules/loading/loading.css
+lib/emby-server/system/dashboard-ui/modules/loading/loading.js
 lib/emby-server/system/dashboard-ui/modules/loadingdialog/loadingdialog.js
 lib/emby-server/system/dashboard-ui/modules/localdatabase/idbcore.js
 lib/emby-server/system/dashboard-ui/modules/localdatabase/itemrepository.js
@@ -672,6 +653,7 @@ lib/emby-server/system/dashboard-ui/modules/metadataeditor/metadataeditor.js
 lib/emby-server/system/dashboard-ui/modules/metadataeditor/metadataeditor.template.html
 lib/emby-server/system/dashboard-ui/modules/metadataeditor/personeditor.js
 lib/emby-server/system/dashboard-ui/modules/metadataeditor/personeditor.template.html
+lib/emby-server/system/dashboard-ui/modules/morphdom/morphdom.js
 lib/emby-server/system/dashboard-ui/modules/multidownload.js
 lib/emby-server/system/dashboard-ui/modules/multiselect/multiselect.css
 lib/emby-server/system/dashboard-ui/modules/multiselect/multiselect.js
@@ -681,15 +663,11 @@ lib/emby-server/system/dashboard-ui/modules/navdrawer/navdrawercontent.js
 lib/emby-server/system/dashboard-ui/modules/notifications.js
 lib/emby-server/system/dashboard-ui/modules/nowplayingbar/nowplayingbar.css
 lib/emby-server/system/dashboard-ui/modules/nowplayingbar/nowplayingbar.js
-lib/emby-server/system/dashboard-ui/modules/onscreenkeyboard/keyboard.js
-lib/emby-server/system/dashboard-ui/modules/onscreenkeyboard/onscreenkeyboard.js
-lib/emby-server/system/dashboard-ui/modules/onscreenkeyboard/style.css
 lib/emby-server/system/dashboard-ui/modules/pagejs/page.js
 lib/emby-server/system/dashboard-ui/modules/photoplayer/plugin.js
 lib/emby-server/system/dashboard-ui/modules/photoscreensaver/plugin.js
 lib/emby-server/system/dashboard-ui/modules/playback/iconosd.css
 lib/emby-server/system/dashboard-ui/modules/playback/mediasession.js
-lib/emby-server/system/dashboard-ui/modules/playback/nowplayinghelper.js
 lib/emby-server/system/dashboard-ui/modules/playback/playbackorientation.js
 lib/emby-server/system/dashboard-ui/modules/playback/playerselection.js
 lib/emby-server/system/dashboard-ui/modules/playback/playersettingsmenu.js
@@ -699,20 +677,29 @@ lib/emby-server/system/dashboard-ui/modules/playerstats/playerstats.css
 lib/emby-server/system/dashboard-ui/modules/playerstats/playerstats.js
 lib/emby-server/system/dashboard-ui/modules/polyfills/array.js
 lib/emby-server/system/dashboard-ui/modules/polyfills/bind.js
+lib/emby-server/system/dashboard-ui/modules/polyfills/crypto.js
+lib/emby-server/system/dashboard-ui/modules/polyfills/css.js
+lib/emby-server/system/dashboard-ui/modules/polyfills/custom-elements-builtin.js
+lib/emby-server/system/dashboard-ui/modules/polyfills/custom-elements.js
+lib/emby-server/system/dashboard-ui/modules/polyfills/document-register-element.js
 lib/emby-server/system/dashboard-ui/modules/polyfills/dragdroptouch.js
 lib/emby-server/system/dashboard-ui/modules/polyfills/element.js
 lib/emby-server/system/dashboard-ui/modules/polyfills/form.js
+lib/emby-server/system/dashboard-ui/modules/polyfills/intersection-observer.js
 lib/emby-server/system/dashboard-ui/modules/polyfills/map.js
 lib/emby-server/system/dashboard-ui/modules/polyfills/native-promise-only.js
 lib/emby-server/system/dashboard-ui/modules/polyfills/numberformat.js
 lib/emby-server/system/dashboard-ui/modules/polyfills/objectassign.js
-lib/emby-server/system/dashboard-ui/modules/polyfills/promiseany.js
-lib/emby-server/system/dashboard-ui/modules/polyfills/raf.js
-lib/emby-server/system/dashboard-ui/modules/polyfills/resize-observer-polyfill/ResizeObserver.js
+lib/emby-server/system/dashboard-ui/modules/polyfills/promise.js
+lib/emby-server/system/dashboard-ui/modules/polyfills/resizeobserver.js
+lib/emby-server/system/dashboard-ui/modules/polyfills/set.js
 lib/emby-server/system/dashboard-ui/modules/polyfills/string.js
 lib/emby-server/system/dashboard-ui/modules/polyfills/weakmap.js
 lib/emby-server/system/dashboard-ui/modules/prompt/prompt.js
 lib/emby-server/system/dashboard-ui/modules/prompt/prompt.template.html
+lib/emby-server/system/dashboard-ui/modules/querystring/querystring.js
+lib/emby-server/system/dashboard-ui/modules/recordingcreator/channelrecording.template.html
+lib/emby-server/system/dashboard-ui/modules/recordingcreator/channelrecordingcreator.js
 lib/emby-server/system/dashboard-ui/modules/recordingcreator/recordingbutton.js
 lib/emby-server/system/dashboard-ui/modules/recordingcreator/recordingcreator.css
 lib/emby-server/system/dashboard-ui/modules/recordingcreator/recordingcreator.js
@@ -724,12 +711,8 @@ lib/emby-server/system/dashboard-ui/modules/recordingcreator/seriesrecordingedit
 lib/emby-server/system/dashboard-ui/modules/recordingcreator/seriesrecordingeditor.template.html
 lib/emby-server/system/dashboard-ui/modules/refreshdialog/refreshdialog.js
 lib/emby-server/system/dashboard-ui/modules/registrationservices/registrationservices.js
-lib/emby-server/system/dashboard-ui/modules/require/requirecss.js
-lib/emby-server/system/dashboard-ui/modules/require/requiretext.js
-lib/emby-server/system/dashboard-ui/modules/router.js
 lib/emby-server/system/dashboard-ui/modules/screensavermanager.js
 lib/emby-server/system/dashboard-ui/modules/scroller/smoothscroller.js
-lib/emby-server/system/dashboard-ui/modules/scrollhelper.js
 lib/emby-server/system/dashboard-ui/modules/scrollstyles.css
 lib/emby-server/system/dashboard-ui/modules/sections.css
 lib/emby-server/system/dashboard-ui/modules/serverrestartdialog/serverrestartdialog.js
@@ -768,6 +751,7 @@ lib/emby-server/system/dashboard-ui/modules/tabbedview/folderstab.js
 lib/emby-server/system/dashboard-ui/modules/tabbedview/folderstab.template.html
 lib/emby-server/system/dashboard-ui/modules/tabbedview/genrestab.js
 lib/emby-server/system/dashboard-ui/modules/tabbedview/itemstab.js
+lib/emby-server/system/dashboard-ui/modules/tabbedview/listcontroller.js
 lib/emby-server/system/dashboard-ui/modules/tabbedview/playliststab.js
 lib/emby-server/system/dashboard-ui/modules/tabbedview/playliststab.template.html
 lib/emby-server/system/dashboard-ui/modules/tabbedview/seriestab.js
@@ -782,22 +766,8 @@ lib/emby-server/system/dashboard-ui/modules/themes/black/theme.json
 lib/emby-server/system/dashboard-ui/modules/themes/blueradiance/bg.jpg
 lib/emby-server/system/dashboard-ui/modules/themes/blueradiance/theme.css
 lib/emby-server/system/dashboard-ui/modules/themes/blueradiance/theme.json
-lib/emby-server/system/dashboard-ui/modules/themes/dark-red/theme.css
-lib/emby-server/system/dashboard-ui/modules/themes/dark-red/theme.json
 lib/emby-server/system/dashboard-ui/modules/themes/dark/theme.css
 lib/emby-server/system/dashboard-ui/modules/themes/dark/theme.json
-lib/emby-server/system/dashboard-ui/modules/themes/halloween/theme.css
-lib/emby-server/system/dashboard-ui/modules/themes/halloween/theme.json
-lib/emby-server/system/dashboard-ui/modules/themes/holiday/theme.css
-lib/emby-server/system/dashboard-ui/modules/themes/holiday/theme.json
-lib/emby-server/system/dashboard-ui/modules/themes/light-blue/theme.css
-lib/emby-server/system/dashboard-ui/modules/themes/light-blue/theme.json
-lib/emby-server/system/dashboard-ui/modules/themes/light-pink/theme.css
-lib/emby-server/system/dashboard-ui/modules/themes/light-pink/theme.json
-lib/emby-server/system/dashboard-ui/modules/themes/light-purple/theme.css
-lib/emby-server/system/dashboard-ui/modules/themes/light-purple/theme.json
-lib/emby-server/system/dashboard-ui/modules/themes/light-red/theme.css
-lib/emby-server/system/dashboard-ui/modules/themes/light-red/theme.json
 lib/emby-server/system/dashboard-ui/modules/themes/light/theme.css
 lib/emby-server/system/dashboard-ui/modules/themes/light/theme.json
 lib/emby-server/system/dashboard-ui/modules/themes/logodark.png
@@ -813,7 +783,7 @@ lib/emby-server/system/dashboard-ui/modules/viewmanager/baseview.js
 lib/emby-server/system/dashboard-ui/modules/viewmanager/viewmanager.js
 lib/emby-server/system/dashboard-ui/modules/viewsettings/viewsettings.js
 lib/emby-server/system/dashboard-ui/modules/viewsettings/viewsettings.template.html
-lib/emby-server/system/dashboard-ui/modules/visibleinviewport.js
+lib/emby-server/system/dashboard-ui/modules/webvtt/vtt.js
 lib/emby-server/system/dashboard-ui/modules/windowdrag.css
 lib/emby-server/system/dashboard-ui/modules/youtubeplayer/plugin.js
 lib/emby-server/system/dashboard-ui/modules/youtubeplayer/style.css
@@ -822,7 +792,6 @@ lib/emby-server/system/dashboard-ui/music/music.html
 lib/emby-server/system/dashboard-ui/music/music.js
 lib/emby-server/system/dashboard-ui/music/songs.js
 lib/emby-server/system/dashboard-ui/music/suggestions.js
-lib/emby-server/system/dashboard-ui/native/operatv/input.js
 lib/emby-server/system/dashboard-ui/network/network.html
 lib/emby-server/system/dashboard-ui/network/network.js
 lib/emby-server/system/dashboard-ui/plugins/addplugin.html
@@ -844,6 +813,8 @@ lib/emby-server/system/dashboard-ui/search/searchfields.css
 lib/emby-server/system/dashboard-ui/search/searchfields.js
 lib/emby-server/system/dashboard-ui/search/searchfields.template.html
 lib/emby-server/system/dashboard-ui/search/searchresults.js
+lib/emby-server/system/dashboard-ui/server/database/database.html
+lib/emby-server/system/dashboard-ui/server/database/database.js
 lib/emby-server/system/dashboard-ui/server/downloads/activity.html
 lib/emby-server/system/dashboard-ui/server/downloads/activity.js
 lib/emby-server/system/dashboard-ui/server/downloads/settings.html
@@ -852,6 +823,7 @@ lib/emby-server/system/dashboard-ui/server/notifications/notificationsetting.htm
 lib/emby-server/system/dashboard-ui/server/notifications/notificationsetting.js
 lib/emby-server/system/dashboard-ui/server/notifications/notificationsettings.html
 lib/emby-server/system/dashboard-ui/server/notifications/notificationsettings.js
+lib/emby-server/system/dashboard-ui/serviceworker-app.js
 lib/emby-server/system/dashboard-ui/serviceworker.js
 lib/emby-server/system/dashboard-ui/settings/cameraupload.html
 lib/emby-server/system/dashboard-ui/settings/cameraupload.js
@@ -878,6 +850,7 @@ lib/emby-server/system/dashboard-ui/settings/settings.html
 lib/emby-server/system/dashboard-ui/settings/settings.js
 lib/emby-server/system/dashboard-ui/settings/subtitles.html
 lib/emby-server/system/dashboard-ui/settings/subtitles.js
+lib/emby-server/system/dashboard-ui/settings/userpasswordcontroller.js
 lib/emby-server/system/dashboard-ui/startup/connectlogin.html
 lib/emby-server/system/dashboard-ui/startup/connectlogin.js
 lib/emby-server/system/dashboard-ui/startup/connectsignup.html
@@ -955,17 +928,24 @@ lib/emby-server/system/dashboard-ui/tv/suggestions.js
 lib/emby-server/system/dashboard-ui/tv/tv.html
 lib/emby-server/system/dashboard-ui/tv/tv.js
 lib/emby-server/system/dashboard-ui/tv/upcoming.js
-lib/emby-server/system/dashboard-ui/userpassword.html
+lib/emby-server/system/dashboard-ui/users/accesstab.js
+lib/emby-server/system/dashboard-ui/users/parentalcontroltab.js
+lib/emby-server/system/dashboard-ui/users/passwordtab.js
+lib/emby-server/system/dashboard-ui/users/profiletab.js
 lib/emby-server/system/dashboard-ui/users/user.html
 lib/emby-server/system/dashboard-ui/users/user.js
-lib/emby-server/system/dashboard-ui/users/userlibraryaccess.html
-lib/emby-server/system/dashboard-ui/users/userlibraryaccess.js
 lib/emby-server/system/dashboard-ui/users/usernew.html
 lib/emby-server/system/dashboard-ui/users/usernew.js
-lib/emby-server/system/dashboard-ui/users/userparentalcontrol.html
-lib/emby-server/system/dashboard-ui/users/userparentalcontrol.js
 lib/emby-server/system/dashboard-ui/users/users.js
 lib/emby-server/system/dashboard-ui/videoosd/ani_equalizer_white.gif
+lib/emby-server/system/dashboard-ui/videoosd/basetab.js
+lib/emby-server/system/dashboard-ui/videoosd/chapterstab.js
+lib/emby-server/system/dashboard-ui/videoosd/guidetab.js
+lib/emby-server/system/dashboard-ui/videoosd/infotab.js
+lib/emby-server/system/dashboard-ui/videoosd/lyrics.css
+lib/emby-server/system/dashboard-ui/videoosd/lyrics.js
+lib/emby-server/system/dashboard-ui/videoosd/onnowtab.js
+lib/emby-server/system/dashboard-ui/videoosd/peopletab.js
 lib/emby-server/system/dashboard-ui/videoosd/playqueue.css
 lib/emby-server/system/dashboard-ui/videoosd/playqueue.js
 lib/emby-server/system/dashboard-ui/videoosd/tvplayqueue.css
@@ -998,9 +978,12 @@ lib/emby-server/system/plugins/AudioDb.dll
 lib/emby-server/system/plugins/BlurayMounter.dll
 lib/emby-server/system/plugins/DvdMounter.dll
 lib/emby-server/system/plugins/Emby.Dlna.dll
+lib/emby-server/system/plugins/Emby.M3UTuner.dll
 lib/emby-server/system/plugins/Emby.PortMapper.dll
 lib/emby-server/system/plugins/Emby.Server.CinemaMode.dll
 lib/emby-server/system/plugins/Emby.Webhooks.dll
+lib/emby-server/system/plugins/Emby.XmlTV.dll
+lib/emby-server/system/plugins/EmbyGuideData.dll
 lib/emby-server/system/plugins/Fanart.dll
 lib/emby-server/system/plugins/MovieDb.dll
 lib/emby-server/system/plugins/MusicBrainz.dll