From ca51b76f61b80477d474d770c0d35c5b2ccbeb80 Mon Sep 17 00:00:00 2001
From: mreid-tt <943378+mreid-tt@users.noreply.github.com>
Date: Tue, 29 Oct 2024 21:14:09 -0400
Subject: [PATCH] Refine Makefiles

---
 cross/jellyfin/Makefile |  3 +--
 spk/jellyfin/Makefile   | 10 ++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/cross/jellyfin/Makefile b/cross/jellyfin/Makefile
index a5a4c4f78a5f..7791ce501628 100644
--- a/cross/jellyfin/Makefile
+++ b/cross/jellyfin/Makefile
@@ -10,8 +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 = 8.0
-BUILD_DEPENDS = native/dotnet-sdk-$(DOTNET_VERSION)
+BUILD_DEPENDS = native/dotnet-sdk-8.0
 
 DOTNET_OUTPUT_PATH = share
 DOTNET_PACKAGE_NAME = Jellyfin.Server
diff --git a/spk/jellyfin/Makefile b/spk/jellyfin/Makefile
index 914ccf7aa0ed..d15710b59a51 100644
--- a/spk/jellyfin/Makefile
+++ b/spk/jellyfin/Makefile
@@ -3,13 +3,12 @@ SPK_NAME = jellyfin
 SPK_VERS = 10.10.0
 SPK_REV = 18
 SPK_ICON = src/jellyfin.png
-WIZARDS_DIR = src/wizard/
-DSM_UI_DIR = app
 
 DEPENDS = cross/jellyfin cross/jellyfin-web
 
 # GLIBC >= 2.28 required
 REQUIRED_MIN_DSM = 7.2
+SPK_DEPENDS = "ffmpeg7"
 
 # x64 and armv8 archs are supported only.
 UNSUPPORTED_ARCHS = $(32bit_ARCHS)
@@ -17,19 +16,22 @@ UNSUPPORTED_ARCHS = $(32bit_ARCHS)
 MAINTAINER = SynoCommunity
 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.10.0<br/>2. Built with dotnet 8.0.10 and nodejs 20.18.0"
 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 = "ffmpeg7"
+
+WIZARDS_DIR = src/wizard/
 
 # 'auto' reserved value grabs SPK_NAME
 SERVICE_USER = auto
 SERVICE_SETUP = src/service-setup.sh
+STARTABLE = yes
 
+DSM_UI_DIR = app
 CONF_DIR = src/conf
 
 # Service configuration