From 91dc09ba3eef5da3647d59dcdd9aaba1a5673f3f Mon Sep 17 00:00:00 2001 From: nyyu Date: Fri, 24 Jun 2022 11:41:43 +0200 Subject: [PATCH] jellyfin: standalone --- jellyfin/PKGBUILD | 15 ++++++++------- jellyfin/jellyfin.service | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/jellyfin/PKGBUILD b/jellyfin/PKGBUILD index ba65807..e466128 100644 --- a/jellyfin/PKGBUILD +++ b/jellyfin/PKGBUILD @@ -6,12 +6,12 @@ _pkgver=10.8.0 pkgbase=jellyfin pkgname=(jellyfin jellyfin-web jellyfin-server) pkgver=10.8.0 -pkgrel=1 +pkgrel=2 pkgdesc='The Free Software Media System' -arch=('i686' 'x86_64' 'armv6h') +arch=('x86_64') url='https://github.com/jellyfin/jellyfin' license=('GPL2') -makedepends=('dotnet-sdk>=6' 'npm' 'git') +makedepends=('dotnet-sdk>=6' 'dotnet-sdk<7' 'nodejs' 'npm' 'git') source=("jellyfin-$_pkgver.tar.gz::https://github.com/jellyfin/jellyfin/archive/v$_pkgver.tar.gz" "jellyfin-web-$_pkgver.tar.gz::https://github.com/jellyfin/jellyfin-web/archive/v$_pkgver.tar.gz" 'jellyfin.conf' @@ -21,7 +21,7 @@ source=("jellyfin-$_pkgver.tar.gz::https://github.com/jellyfin/jellyfin/archive/ sha512sums=('26498242c3d3b9897d79c7257d57970ad23bcf04fcef8e5ba4b2e93aab6125bcaaf1ae4796a2ddcd23471d86821f80da232840e18c27410cd97a92dac49cdeeb' 'c08615d571cccc903c27cc4eebebf6f634c6a27362ec061a474c234f4e7b469d57339923d3de2cbfa621fce530ce58a8118d7d56054e17487fc230b270aebca3' '2aa97a1a7a8a447171b59be3e93183e09cbbc32c816843cc47c6777b9aec48bd9c1d9d354f166e0b000ad8d2e94e6e4b0559aa52e5c159abbc103ed2c5afa3f0' - '99d02080b1b92e731250f39ddd13ceca7129d69d0c05e0939620cbc3f499a9574668c63fa889704a4905560888131e980d7ab1fbcc5837b04d33ce26daa9d42b' + 'ce9c5f3f0f3353894825e747f4f95a83fdf10a36c4366c1c6768c737187bc1537dd33bfe0c131a65849e3916ed5177f5c7011c836da01f401588140b6f643908' '6fc2638e6ec4b1ee0240e17815c91107b694e5fde72c1bc7956c83067bbeacb632de899b86837e47a0ec04288131b15c20746373b45e0669c8976069a55d627a' '45a62b62d97b9a83289d4dfde684163b1bcf340c1921fb958e5a701812c61b392901841940c67e5fa5148783277d5b4dc65ba01d3a22e8f855ea62154ad9be33') @@ -29,7 +29,7 @@ build(){ # Build jellyfin-web cd jellyfin-web-$_pkgver - npm install --cache "$srcdir"/npm-cache + npm ci --no-audit # Build jellyfin-server cd ../jellyfin-$_pkgver @@ -44,7 +44,7 @@ build(){ # Restore completed in 56.84 ms for /aur/jellyfin-git/src/jellyfin/Jellyfin.Server/Jellyfin.Server.csproj. # ==> ERROR: A failure occurred in package(). # without indicating any sort of failure. - dotnet publish --configuration Release Jellyfin.Server --output "$PWD"/publish + dotnet publish --runtime linux-x64 --configuration Release Jellyfin.Server --output "$PWD"/publish # Clean up the runtimes folder (keep linux-*) rm -rfv publish/runtimes/{alpine-*,osx*,tizen-*,win*} } @@ -55,7 +55,8 @@ package_jellyfin() { package_jellyfin-server() { pkgdesc="Jellyfin server component" - depends=('dotnet-runtime>=5' 'aspnet-runtime>=5' 'ffmpeg' 'sqlite') + optdepends=('jellyfin-ffmpeg5: Patched FFmpeg providing hardware acceleration and tonemapping support') + depends=('ffmpeg') backup=('etc/conf.d/jellyfin') mkdir -p "$pkgdir"/usr/lib diff --git a/jellyfin/jellyfin.service b/jellyfin/jellyfin.service index cd1626b..a7589c7 100644 --- a/jellyfin/jellyfin.service +++ b/jellyfin/jellyfin.service @@ -5,7 +5,7 @@ After=network.target [Service] User=jellyfin EnvironmentFile=/etc/conf.d/jellyfin -ExecStart=/usr/bin/dotnet /usr/lib/jellyfin/jellyfin.dll --datadir ${JELLYFIN_DATA_DIRECTORY} --cachedir ${JELLYFIN_CACHE_DIRECTORY} ${JELLYFIN_ADD_OPTS} +ExecStart=/usr/lib/jellyfin/jellyfin --datadir ${JELLYFIN_DATA_DIRECTORY} --cachedir ${JELLYFIN_CACHE_DIRECTORY} ${JELLYFIN_ADD_OPTS} Restart=on-abort TimeoutSec=20