Adapt for upstream changes

should work again now

4 files changed, 15 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6cfb859e3455..25557df1156d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = jellyfin-git
 	pkgdesc = The Free Software Media Browser
-	pkgver = r14688.f0c378979
+	pkgver = r14803.a069d3f79
 	pkgrel = 1
 	url = https://github.com/jellyfin/jellyfin
 	arch = i686
@@ -17,12 +17,14 @@ pkgbase = jellyfin-git
 	backup = etc/conf.d/jellyfin
 	source = git+https://github.com/jellyfin/jellyfin.git
 	source = git+https://github.com/mono/taglib-sharp.git
+	source = jellyfin.conf
 	source = jellyfin.service
 	source = jellyfin.sysusers
 	source = jellyfin.tmpfiles
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 982682d72fea64f0dd0c123e3a597699b7f5de306be7bca7c06993d13b51f5e1
+	sha256sums = ff3c81ddfd716f179fec8149ea6c2db379e05cd20bd0ffa8ce3ff3a609ca9749
+	sha256sums = 61febaa0bbe71235d724f236223c7315da393b8b481e4bbed86489a343bca51f
 	sha256sums = effc1cf85c0c959da73bedbcd94e00cfd317dd876f710183b7baf04209055ea2
 	sha256sums = aa87d52386dde4a2ea4663de2f08249415b2babfefd98d348a96df35dfc36bc0
 
diff --git a/PKGBUILD b/PKGBUILD
index 04ed5e7a20bc..f2168865ab1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Daniel Seymour <dannyseeless@gmail.com>
 
 pkgname=jellyfin-git
-pkgver=r14688.f0c378979
+pkgver=r14803.a069d3f79
 pkgrel=1
 pkgdesc='The Free Software Media Browser'
 arch=('i686' 'x86_64' 'armv6h')
@@ -15,13 +15,15 @@ provides=('jellyfin')
 conflicts=('jellyfin')
 source=('git+https://github.com/jellyfin/jellyfin.git'
         'git+https://github.com/mono/taglib-sharp.git'
+        'jellyfin.conf'
         'jellyfin.service'
         'jellyfin.sysusers'
         'jellyfin.tmpfiles')
 backup=('etc/conf.d/jellyfin')
 sha256sums=('SKIP'
             'SKIP'
-            '982682d72fea64f0dd0c123e3a597699b7f5de306be7bca7c06993d13b51f5e1'
+            'ff3c81ddfd716f179fec8149ea6c2db379e05cd20bd0ffa8ce3ff3a609ca9749'
+            '61febaa0bbe71235d724f236223c7315da393b8b481e4bbed86489a343bca51f'
             'effc1cf85c0c959da73bedbcd94e00cfd317dd876f710183b7baf04209055ea2'
             'aa87d52386dde4a2ea4663de2f08249415b2babfefd98d348a96df35dfc36bc0')
 
@@ -54,6 +56,7 @@ package() {
   install -Dm 644 jellyfin.service -t "${pkgdir}"/usr/lib/systemd/system/
   install -Dm 644 jellyfin.sysusers "${pkgdir}"/usr/lib/sysusers.d/jellyfin.conf
   install -Dm 644 jellyfin.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/jellyfin.conf
+  install -Dm 644 jellyfin.conf "${pkgdir}"/etc/conf.d/jellyfin
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/jellyfin.conf b/jellyfin.conf
new file mode 100644
index 000000000000..2b6973c4f088
--- /dev/null
+++ b/jellyfin.conf
@@ -0,0 +1,4 @@
+# Data directory
+JELLYFIN_DATA="/var/lib/jellyfin"
+# Additional options for the binary
+JELLYFIN_ADD_OPTS=""
diff --git a/jellyfin.service b/jellyfin.service
index 019c1b66625b..c929d2346a8c 100644
--- a/jellyfin.service
+++ b/jellyfin.service
@@ -4,7 +4,8 @@ After=network.target
 
 [Service]
 User=jellyfin
-ExecStart=/usr/bin/dotnet /usr/lib/jellyfin/EmbyServer.dll
+EnvironmentFile=/etc/conf.d/jellyfin
+ExecStart=/usr/bin/dotnet /usr/lib/jellyfin/jellyfin.dll -programdata ${JELLYFIN_DATA} ${JELLYFIN_ADD_OPTS}
 Restart=on-abort
 TimeoutSec=20