Jellyfin 10.9.x (SynoCommunity#6101)

* update jellyfin 10.9.1 update jellyfin 10.9.1 update dotnet 8.0.4 update nodejs 20.0.0 * drop support for DSM 6 * update jellyfin update dotnet 8.0.301 and ffmpeg version * update jellyfin ffmpeg update ffmpeg to 6.0 version * update dotnet-sdk update dotnet 8.0.6 * update jellyfin 10.9.4 * modify jellyfin ffmpeg version SPK_DEPENDS = "ffmpeg6" * update jellyfin 10.9.5 * update jellyfin 10.9.6 * finally set REQUIRED_MIN_DSM = 7.2 --------- Co-authored-by: hgy59 <[email protected]>
hgy59 · Jun 18, 2024 · e742c4c · e742c4c
1 parent 2d893b1
commit e742c4c
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 36 deletions.
diff --git a/cross/jellyfin-web/Makefile b/cross/jellyfin-web/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = jellyfin-web
-PKG_VERS = 10.8.13
+PKG_VERS = 10.9.6
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/jellyfin/jellyfin-web/archive

diff --git a/cross/jellyfin-web/digests b/cross/jellyfin-web/digests
@@ -1,3 +1,3 @@
-jellyfin-web-10.8.13.tar.gz SHA1 3e488e221b9c33b0ef6b472348625c75656c61bf
-jellyfin-web-10.8.13.tar.gz SHA256 ba67c8e973e0155924fc0646b165ec9a7e0d75e6ca9c39960daa7579e7af7505
-jellyfin-web-10.8.13.tar.gz MD5 dcde9c0c3b889020d9ee65bae34083f1
+jellyfin-web-10.9.6.tar.gz SHA1 aa7bb05eb47b6b305e6f259434a053e8b47fb961
+jellyfin-web-10.9.6.tar.gz SHA256 7095069abd46d692d9aaa6c9119ab84f177e13d34a719c25c37b769f98d13b46
+jellyfin-web-10.9.6.tar.gz MD5 a5dc1288f30a9f871add440d6895485f
diff --git a/cross/jellyfin/Makefile b/cross/jellyfin/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = jellyfin
-PKG_VERS = 10.8.13
+PKG_VERS = 10.9.6
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/jellyfin/jellyfin/archive
@@ -10,7 +10,7 @@ HOMEPAGE = https://jellyfin.org
 COMMENT  = The Free Software Media System. It is an alternative to the proprietary Emby and Plex.
 LICENSE  = GPLv2
 
-DOTNET_VERSION = 6.0
+DOTNET_VERSION = 8.0
 BUILD_DEPENDS = native/dotnet-sdk-$(DOTNET_VERSION)
 
 DOTNET_OUTPUT_PATH = share

diff --git a/cross/jellyfin/digests b/cross/jellyfin/digests
@@ -1,3 +1,3 @@
-jellyfin-10.8.13.tar.gz SHA1 96079e9aa4ff0a3101f5b650b7759a34b2cfd963
-jellyfin-10.8.13.tar.gz SHA256 aee70eacb9c72a64eb7b4413b1d4b55fea99863b8a54f5ccb552f0bf91152e36
-jellyfin-10.8.13.tar.gz MD5 174925eb730149a2e8ad4aa380fc85a0
+jellyfin-10.9.6.tar.gz SHA1 4c7c33a9d00f75cdae8a72b3bb41368374ff03e6
+jellyfin-10.9.6.tar.gz SHA256 183a114598347a3a5faebba04b524161c4424450fca4435b46b294d8088404ae
+jellyfin-10.9.6.tar.gz MD5 b27cc3a9abef63636a34598cbf1672b2
diff --git a/native/dotnet-sdk-8.0/Makefile b/native/dotnet-sdk-8.0/Makefile
@@ -0,0 +1,22 @@
+PKG_NAME = dotnet-sdk-8.0
+# Version 8.0.6, 8.0.301
+# https://dotnet.microsoft.com/download/dotnet/8.0
+PKG_VERS = 8.0.301
+PKG_EXT = tar.gz
+PKG_DIST_NAME = dotnet-sdk-$(PKG_VERS)-linux-x64.$(PKG_EXT)
+PKG_DIST_SITE = https://dotnetcli.azureedge.net/dotnet/Sdk/${PKG_VERS}
+
+HOMEPAGE = https://dotnet.microsoft.com/
+COMMENT  = A developer platform for building apps.
+LICENSE  = MIT
+
+# just extract and create folder for nuget packages
+INSTALL_TARGET = dotnet_native_install
+
+NUGET_PACKAGES_DIR = $(DISTRIB_DIR)/nuget/packages
+
+include ../../mk/spksrc.native-install.mk
+
+.PHONY: dotnet_native_install
+dotnet_native_install:
+	mkdir -p $(NUGET_PACKAGES_DIR)
diff --git a/native/dotnet-sdk-8.0/digests b/native/dotnet-sdk-8.0/digests
@@ -0,0 +1,3 @@
+dotnet-sdk-8.0.301-linux-x64.tar.gz SHA1 c6a978b16e2462ce91446d987cca349c875db5d3
+dotnet-sdk-8.0.301-linux-x64.tar.gz SHA256 d237cf0e8865f51eb9634df32a8bcfb1dd95dac95c0d16b5d599df867ab16c27
+dotnet-sdk-8.0.301-linux-x64.tar.gz MD5 d91e94323d8db5551c9a5179162f2532
diff --git a/native/nodejs/Makefile b/native/nodejs/Makefile
@@ -1,7 +1,8 @@
 PKG_NAME = nodejs
-# https://nodejs.org/en/about/releases/
-# v18 is active LTS Version "Hydrogen" from 2022-10-25 to 2023-10-18 with EOL at 2025-04-30
-PKG_VERS = 18.20.0
+# https://github.com/nodejs/release#release-schedule
+# v18 is Maintenance Version "Hydrogen" since 2023-10-18 with EOL at 2025-04-30
+# v20 is LTS Version "Iron" from 2023-10-24 to 2024-10-22 with EOL at 2026-04-30
+PKG_VERS = 20.14.0
 PKG_EXT = tar.xz
 PKG_DIST_NAME = node-v$(PKG_VERS)-linux-x64.$(PKG_EXT)
 PKG_DIST_SITE = https://nodejs.org/dist/v$(PKG_VERS)

diff --git a/native/nodejs/digests b/native/nodejs/digests
@@ -1,3 +1,3 @@
-node-v18.20.0-linux-x64.tar.xz SHA1 8d67b84fcf19a5830f0acc95873da8579019dead
-node-v18.20.0-linux-x64.tar.xz SHA256 03eea148e56785babb27930b05ed6bf311aaa3bc573c0399dd63cad2fe5713c7
-node-v18.20.0-linux-x64.tar.xz MD5 23ab56b824d15ffd1d022bb5e2abc7ec
+node-v20.14.0-linux-x64.tar.xz SHA1 dad41d89d58bc8b5d1a5b85d1704b44bc929cbca
+node-v20.14.0-linux-x64.tar.xz SHA256 fedf8fa73b6f51c4ffcc5da8f86cd1ed381bc9dceae0829832c7d683a78b8e36
+node-v20.14.0-linux-x64.tar.xz MD5 efab60d77c41ee1fb0f1cb226ad1f346
diff --git a/spk/jellyfin/Makefile b/spk/jellyfin/Makefile
@@ -1,28 +1,30 @@
 # Remember to also update jellyfin-web
 SPK_NAME = jellyfin
-SPK_VERS = 10.8.13
-SPK_REV = 13
+SPK_VERS = 10.9.6
+SPK_REV = 14
 SPK_ICON = src/jellyfin.png
 WIZARDS_DIR = src/wizard/
 DSM_UI_DIR = app
 
-OPTIONAL_DEPENDS = cross/libstdc++
 DEPENDS = cross/jellyfin cross/jellyfin-web
 
+# GLIBC >= 2.28 required
+REQUIRED_MIN_DSM = 7.2
+
 # x64 and armv8 archs are supported only.
 UNSUPPORTED_ARCHS = $(32bit_ARCHS)
 
-MAINTAINER = SynoCommunity
+MAINTAINER = stevenliuit
 DESCRIPTION = "The Free Software Media System. It is an alternative to the proprietary Emby and Plex."
 DISPLAY_NAME = Jellyfin
 STARTABLE = yes
-CHANGELOG = "1. Update jellyfin to 10.8.13<br/>2. Update dotnet to 6.0.25."
+CHANGELOG = "Update jellyfin to 10.9.6<br/>Built with dotnet 8 and nodejs 20."
 HOMEPAGE = https://jellyfin.org
 HELPURL = https://jellyfin.org/docs/general/server/settings.html
 SUPPORTURL = https://jellyfin.org/docs/general/getting-help.html
 LICENSE = GPLv2
 LICENSE_FILE = $(WORK_DIR)/$(SPK_NAME)-$(SPK_VERS)/LICENSE
-SPK_DEPENDS = "ffmpeg>=4.2"
+SPK_DEPENDS = "ffmpeg6"
 
 # 'auto' reserved value grabs SPK_NAME
 SERVICE_USER = auto
@@ -37,18 +39,4 @@ SERVICE_PORT_TITLE = Jellyfin (HTTP)
 # Admin link
 ADMIN_PORT = $(SERVICE_PORT)
 
-include ../../mk/spksrc.common.mk
-ifeq ($(call version_lt, ${TCVERSION}, 7.0),1)
-# we do not only need the updated libstdc++ library, we also need to
-# adjust the library search path for jellyfin to use this version.
-DEPENDS += cross/libstdc++
-POST_STRIP_TARGET = jellyfin_patch_target
-endif
-
 include ../../mk/spksrc.spk.mk
-
-.PHONY: jellyfin_patch_target
-# Set library path to use bundled libstdc++
-jellyfin_patch_target:
-	@$(MSG) "Set library runpath in jellyfin executable."
-	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/share/$(SPK_NAME)
diff --git a/spk/jellyfin/src/service-setup.sh b/spk/jellyfin/src/service-setup.sh
@@ -8,7 +8,7 @@ JELLYFIN_ARGS="--service \
  -c ${SYNOPKG_PKGVAR}/config \
  -l ${SYNOPKG_PKGVAR}/log \
  -w ${SYNOPKG_PKGDEST}/web \
- --ffmpeg /var/packages/ffmpeg/target/bin/ffmpeg"
+ --ffmpeg /var/packages/ffmpeg6/target/bin/ffmpeg"
 
 SERVICE_COMMAND="${SYNOPKG_PKGDEST}/share/jellyfin ${JELLYFIN_ARGS}"