Update to 10.7.1

1 files changed, 60 insertions, 33 deletions

diff --git a/PKGBUILD b/PKGBUILD
index df3a58ca60e6..d95bd5316b59 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
-# Maintainer: Erikas Rudinskas <erikmnkl@gmail.com>
+# Maintainer: Eric Cheng <ericcheng@hey.com>
 
-pkgname=jellyfin-bin
-pkgver=10.5.5
-_pkgver="$pkgver-1"
+pkgbase=jellyfin-bin
+pkgname=(jellyfin-bin jellyfin-web-bin jellyfin-server-bin)
+pkgver=10.7.1
+_pkgver="${pkgver}-1"
 pkgrel=1
 pkgdesc='The Free Software Media System'
 arch=('x86_64' 'aarch64' 'armv7h')
@@ -10,36 +11,62 @@ url='https://jellyfin.org/'
 license=('GPL2')
 provides=('jellyfin')
 conflicts=('jellyfin' 'jellyfin-git')
-depends=('ffmpeg' 'sqlite')
-optdepends=('ffmpeg-mmal: OpenMAX OMX hardware acceleration on Raspberry Pis')
-source=('jellyfin.conf'
-        'jellyfin.service'
-        'jellyfin.sysusers'
-        'jellyfin.tmpfiles')
-#source_x86_64=("https://repo.jellyfin.org/releases/server/debian/versions/${pkgver}/jellyfin_${_pkgver}_amd64.deb")
-#source_aarch64=("https://repo.jellyfin.org/releases/server/debian/versions/${pkgver}/jellyfin_${_pkgver}_arm64.deb")
-#source_armv7h=("https://repo.jellyfin.org/releases/server/debian/versions/${pkgver}/jellyfin_${_pkgver}_armhf.deb")
-source_x86_64=("https://github.com/jellyfin/jellyfin/releases/download/v${pkgver}/jellyfin_${_pkgver}_debian-amd64.deb")
-source_aarch64=("https://github.com/jellyfin/jellyfin/releases/download/v${pkgver}/jellyfin_${_pkgver}_debian-arm64.deb")
-source_armv7h=("https://github.com/jellyfin/jellyfin/releases/download/v${pkgver}/jellyfin_${_pkgver}_debian-armhf.deb")
-sha256sums=('9f8dafb06676f972fca88cc1cedf5936518b5a7556628482aeea2c7f2f485678'
-            '0f8511673816daf528625366b6c27bc7e6182e4ac789191c87474667398376e2'
-            '9bc1ddb77c73d46cc4078356b5773e5a776ebf8b47a1c820ad5fb17591ad5228'
-            'b7faa4b0c756cdb361ef5b04fddfdc416b00f1246bb3a19a34bf4d185a6a7e5a')
-sha256sums_x86_64=('f036e7247ae47a19d68765901b8a9c65b4996640ff950fe33995e728a4fa51d7')
-sha256sums_aarch64=('fbd10596766b093a67b8f9988c3663097d4abf06ed5b97c99b467f03041a7880')
-sha256sums_armv7h=('bd511e580d3c7705a5694531c77efa155bab3a554e8ba9e91c270ec623831573')
-
+source=(
+	'jellyfin.conf'
+	'jellyfin.service'
+	'jellyfin.sysusers'
+	'jellyfin.tmpfiles'
+	"jellyfin-web-${pkgver}.deb::https://repo.jellyfin.org/releases/server/debian/stable/web/jellyfin-web_${_pkgver}_all.deb"
+)
+source_x86_64=("jellyfin-${pkgver}.deb::https://repo.jellyfin.org/releases/server/debian/stable/server/jellyfin-server_${_pkgver}_amd64.deb")
+source_aarch64=("jellyfin-${pkgver}.deb::https://repo.jellyfin.org/releases/server/debian/stable/server/jellyfin-server_${_pkgver}_arm64.deb")
+source_armv7h=("jellyfin-${pkgver}.deb::https://repo.jellyfin.org/releases/server/debian/stable/server/jellyfin-server_${_pkgver}_armhf.deb")
+sha256sums=(
+	'1ea19635cced6672484937903c27976a5a145d708caff06a687a8defdd23d549'
+	'0f8511673816daf528625366b6c27bc7e6182e4ac789191c87474667398376e2'
+	'9bc1ddb77c73d46cc4078356b5773e5a776ebf8b47a1c820ad5fb17591ad5228'
+	'b7faa4b0c756cdb361ef5b04fddfdc416b00f1246bb3a19a34bf4d185a6a7e5a'
+	'19cf6bad41176c46950bf5ebb5cfd94efda4582cb898524e0a1ea7576e523af1'
+)
+sha256sums_x86_64=('3e2ced1f99167961e341dae674a94d8fd892a857bcc3bba026654ce9284062de')
+sha256sums_aarch64=('1f71f7113f58724fc8a17b50c0b26df204f6c17f48baf3a819b6c4f0cc22a17b')
+sha256sums_armv7h=('27153be892bcd51f29921beca807e738cc7e8144a195f9f10e61ee902f663a38')
+noextract=("jellyfin-${pkgver}.deb" "jellyfin-web-${pkgver}.deb")
 options=('staticlibs')
 
-package() {
-	tar -xf data.tar.xz
+prepare() {
+    mkdir -p "jellyfin-web" "jellyfin-server"
+    bsdtar -xf "jellyfin-web-${pkgver}.deb" -C "jellyfin-web"
+	bsdtar -xf "jellyfin-${pkgver}.deb" -C "jellyfin-server"
+}
+
+package_jellyfin-bin() {
+	depends=("jellyfin-web-bin=${pkgver}" "jellyfin-server-bin=${pkgver}")
+}
+
+package_jellyfin-server-bin() {
+	pkgdesc="Jellyfin server component"
+	optdepends=('ffmpeg-mmal: OpenMAX OMX hardware acceleration on Raspberry Pis')
+	depends=('ffmpeg')
+	provides=('jellyfin-server')
+	conflicts=('jellyfin-server' 'jellyfin-server-git')
+	backup=('etc/conf.d/jellyfin')
+
+	tar -xf "jellyfin-server/data.tar.xz" -C "jellyfin-server"
+	cp -r "$srcdir/jellyfin-server/usr" "$pkgdir/usr"
+	rm -r "$pkgdir/usr/share"
+
+	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"
+}
+
+package_jellyfin-web-bin() {
+	pkgdesc="Jellyfin web client"
+	provides=('jellyfin-web')
+	conflicts=('jellyfin-web' 'jellyfin-web-git')
 
-	cp -r -fHip "$srcdir"/usr "$pkgdir"/usr
-	rm -r "$pkgdir"/usr/share
-	
-	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
+	tar -xf "jellyfin-web/data.tar.xz" -C "jellyfin-web"
+	cp -r "$srcdir/jellyfin-web/usr" "$pkgdir/"
 }