multimedia/emby-server-devel: update to 4.8.0.0

Changes: https://github.com/MediaBrowser/Emby.Releases/releases/tag/4.8.0.0

4 files changed, 9 insertions, 121 deletions

diff --git a/multimedia/emby-server-devel/Makefile b/multimedia/emby-server-devel/Makefile
index 8e0dae78f588..a10b7a017deb 100644
--- a/multimedia/emby-server-devel/Makefile
+++ b/multimedia/emby-server-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	emby-server
-DISTVERSION=	4.7.0.40
+DISTVERSION=	4.8.0.0
 CATEGORIES=	multimedia
 MASTER_SITES=	https://github.com/MediaBrowser/Emby.Releases/releases/download/${PORTVERSION}/ \
 		https://mediabrowser.github.io/embytools/
@@ -119,7 +119,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-devel/distinfo b/multimedia/emby-server-devel/distinfo
index bac036302aba..22f351d21896 100644
--- a/multimedia/emby-server-devel/distinfo
+++ b/multimedia/emby-server-devel/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1652737622
-SHA256 (emby-server-devel/embyserver-netframework_4.7.0.40.zip) = 5eeaeb1259da2438e25f59badf26cfca47feabc08b23ae08504cd2bcf1dfde97
-SIZE (emby-server-devel/embyserver-netframework_4.7.0.40.zip) = 48595457
-SHA256 (emby-server-devel/ffdetect-2021_02_27-x64_freebsd13.tar.xz) = 883e02378da5f111931e36226fe85bcf19deeaaf4ede446e267081838e936ac7
-SIZE (emby-server-devel/ffdetect-2021_02_27-x64_freebsd13.tar.xz) = 75244
-SHA256 (emby-server-devel/ffmpeg-2021_02_27.tar.gz) = dd587ddbde4c967695919d7f85b0f28e6d7262f55171f3e8052eef2f4a7f585c
-SIZE (emby-server-devel/ffmpeg-2021_02_27.tar.gz) = 13236851
+TIMESTAMP = 1653522320
+SHA256 (emby-server-devel/embyserver-netframework_4.8.0.0.zip) = f851387aabb6b9990d69400a67b4ed93abfaec3ae283fb9007d2b6295597fc83
+SIZE (emby-server-devel/embyserver-netframework_4.8.0.0.zip) = 48578343
+SHA256 (emby-server-devel/ffdetect-2022_05_07-x64_freebsd13.tar.xz) = 88e82f76e5e82568bdd7800ec5c6d5c05d33c4c951dae0712d078112cee80e64
+SIZE (emby-server-devel/ffdetect-2022_05_07-x64_freebsd13.tar.xz) = 75308
+SHA256 (emby-server-devel/ffmpeg-2022_05_07.tar.gz) = 44506c7c4fa41c721819f9b530b021e11921ea2a1332ce947d8af5a06a2df01e
+SIZE (emby-server-devel/ffmpeg-2022_05_07.tar.gz) = 14301915
 SHA256 (emby-server-devel/license.docx) = a6d7ea65dcb06392479a85e1a10a7aeb872d803da6f784f6935fcd4ee63008c6
 SIZE (emby-server-devel/license.docx) = 18373
diff --git a/multimedia/emby-server-devel/files/patch-dav1d-1.0 b/multimedia/emby-server-devel/files/patch-dav1d-1.0
deleted file mode 100644
index 1c4ca68a21f9..000000000000
--- a/multimedia/emby-server-devel/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-devel/pkg-plist b/multimedia/emby-server-devel/pkg-plist
index 6800de2a81c0..e9aa1262be53 100644
--- a/multimedia/emby-server-devel/pkg-plist
+++ b/multimedia/emby-server-devel/pkg-plist
@@ -990,7 +990,6 @@ lib/emby-server/system/plugins/MusicBrainz.dll
 lib/emby-server/system/plugins/NfoMetadata.dll
 lib/emby-server/system/plugins/OMDb.dll
 lib/emby-server/system/plugins/OpenSubtitles.dll
-lib/emby-server/system/plugins/SchedulesDirect.dll
 lib/emby-server/system/plugins/StudioImages.dll
 lib/emby-server/system/plugins/Tvdb.dll
 lib/emby-server/system/x64/libSkiaSharp.dll