xteve: 2.2.0.200-1

7 files changed, 72 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f9c5a90b9ab2..ea0b6dcd104a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,22 @@
 pkgbase = xteve
-	pkgdesc = IPTV Proxy for Plex DVR
-	pkgver = 2.2
+	pkgdesc = M3U Proxy for Plex DVR and Emby Live TV.
+	pkgver = 2.2.0.200
 	pkgrel = 1
 	url = https://xteve.de
 	arch = x86_64
+	arch = aarch64
+	arch = armv7h
+	arch = armv6h
 	license = MIT
+	source = xteve-2.2.0.200.tar.gz::https://github.com/xteve-project/xTeVe/archive/refs/tags/2.2.0.200.tar.gz
 	source = xteve.service
 	source = xteve.sysusers
 	source = xteve.tmpfiles
-	source = https://github.com/xteve-project/xTeVe-Downloads/raw/master/xteve_linux_amd64.tar.gz
-	sha256sums = 931947d35b91d5763ba6218bdc9096b792d6e1718a9fca0a77b0ffb186c5ed36
-	sha256sums = dbf54529cec6663f89bdc5600df30e3328014096f61c3d43f3d8196556919ce3
-	sha256sums = 17bbf3c47404d3876f99c20ed2cc8787f8c4fea29717d18514d459af852825fb
-	sha256sums = 4fbe2999fe8fa80196060321eeabd76fda80aed713022769f0c2d45b20c0d107
+	source = xteve.user.service
+	sha256sums = d17566bc840534f4a1b1223d0d2332ab6b98e8c94f02ce1e941186b7cc67c484
+	sha256sums = e43e0b770e4b55f0b4bcdc648dd3a77837a7de67541dd0d9a6f1a9b14380dba1
+	sha256sums = 3159b3643846bbe4fa2e59ce1694cdc73abea1e81dc11b271f638a18ddb0782c
+	sha256sums = 93a0d4657ca04679329c8cd52a0bb834c46e8b9ec548a410e2ab9f49e3d1fc7b
+	sha256sums = c5252b64bcb7f18197fc10ad778131ca37dbe844eddd1a661d95a1a35b4f6a5b
 
 pkgname = xteve
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..9acdf966c1a9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+pkg
+src
+*.tar.gz
+*.pkg.tar.zst
diff --git a/PKGBUILD b/PKGBUILD
index f73b26883002..e36e9d9715fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,39 @@
 # Maintainer: Kalani Helekunihi <i [at] am [dot] guru>
+# Maintainer: Evine Deng <evinedeng@hotmail.com>
 
 pkgname=xteve
-pkgver=2.2
+_reponame="xTeVe"
+pkgver=2.2.0.200
 pkgrel=1
-pkgdesc="IPTV Proxy for Plex DVR"
-arch=('x86_64')
+pkgdesc="M3U Proxy for Plex DVR and Emby Live TV."
+arch=("x86_64" "aarch64" "armv7h" "armv6h")
 url="https://xteve.de"
+_url="https://github.com/${pkgname}-project/${_reponame}"
 license=('MIT')
-source=("${pkgname}.service"
-	"${pkgname}.sysusers"
-	"${pkgname}.tmpfiles"
-    "https://github.com/xteve-project/xTeVe-Downloads/raw/master/"$pkgname"_linux_amd64.tar.gz")
-sha256sums=('931947d35b91d5763ba6218bdc9096b792d6e1718a9fca0a77b0ffb186c5ed36' 'dbf54529cec6663f89bdc5600df30e3328014096f61c3d43f3d8196556919ce3' '17bbf3c47404d3876f99c20ed2cc8787f8c4fea29717d18514d459af852825fb' '4fbe2999fe8fa80196060321eeabd76fda80aed713022769f0c2d45b20c0d107' )
+source=("${pkgname}-${pkgver}.tar.gz::${_url}/archive/refs/tags/${pkgver}.tar.gz"
+        "${pkgname}.service"
+        "${pkgname}.sysusers"
+        "${pkgname}.tmpfiles"
+        "${pkgname}.user.service")
+sha256sums=('d17566bc840534f4a1b1223d0d2332ab6b98e8c94f02ce1e941186b7cc67c484'
+            '219b4c59994436220236a2da73e32d1f04047c7e463e72e8c8d3cdd4c7ae819c'
+            '3159b3643846bbe4fa2e59ce1694cdc73abea1e81dc11b271f638a18ddb0782c'
+            '93a0d4657ca04679329c8cd52a0bb834c46e8b9ec548a410e2ab9f49e3d1fc7b'
+            'b37977d867e54bb4b7ddf2fb3a228f282419e803d8c42a1d7f833037d40d2b52')
 
-package() {
-	install -Dm755 ${srcdir}/xteve $pkgdir/usr/bin/${pkgname}
-	install -Dm0644 ${srcdir}/${pkgname}.sysusers ${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf
-	install -Dm0644 ${srcdir}/${pkgname}.service $pkgdir/usr/lib/systemd/system/${pkgname}.service
-	install -Dm0644 ${srcdir}/${pkgname}.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
+build() {
+    cd "${_reponame}-${pkgver}"
+    local ldflags=" -s -w -extldflags '${LDFLAGS}'"
+    go build -trimpath -ldflags "${ldflags}" -o "${pkgname}"
 }
 
+package() {
+    install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+    install -Dm644 "${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+    install -Dm644 "${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+    install -Dm644 "${pkgname}.user.service" "${pkgdir}/usr/lib/systemd/user/${pkgname}.service"
+
+    cd "${_reponame}-${pkgver}"
+    install -Dm755 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+    install -Dm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md"
+}
diff --git a/xteve.service b/xteve.service
index 05f0df66fe4c..5da3bb08c14f 100644
--- a/xteve.service
+++ b/xteve.service
@@ -1,18 +1,16 @@
 [Unit]
-Description=xTeVe Service
-Wants=network-online.target
-After=network-online.target
+Description = M3U Proxy for Plex DVR and Emby Live TV.
+After = network-online.target
 
 [Service]
-User=xteve
-Group=xteve
-Type=simple
-ExecStart=/usr/bin/xteve 
-ExecReload=/usr/bin/killall xteve
-ExecStop=/usr/bin/killall xteve
-KillMode=process
-Restart=always
-RestartSec=15
+User = xteve
+Group = xteve
+WorkingDirectory = /var/lib/xteve
+ExecStart = xteve --config /var/lib/xteve
+KillMode = process
+Restart = always
+RestartSec = 15
+ExecStopPost = /usr/bin/rm -rf /tmp/xteve
 
 [Install]
-WantedBy=multi-user.target
+WantedBy = multi-user.target
diff --git a/xteve.sysusers b/xteve.sysusers
index 01d484f6b0b3..f828000a75b5 100644
--- a/xteve.sysusers
+++ b/xteve.sysusers
@@ -1 +1 @@
-u xteve - "xTeVe IPTV Proxy for Plex" /var/lib/xteve
+u "xteve" - "xTeVe" /var/lib/xteve -
diff --git a/xteve.tmpfiles b/xteve.tmpfiles
index f8200e03b536..2da5d9e5c3ee 100644
--- a/xteve.tmpfiles
+++ b/xteve.tmpfiles
@@ -1,2 +1 @@
-d /var/lib/xteve 0755 xteve xteve
-d /tmp/xteve 0755 xteve xteve
+d /var/lib/xteve 0755 xteve xteve -
diff --git a/xteve.user.service b/xteve.user.service
new file mode 100644
index 000000000000..62bc62823f65
--- /dev/null
+++ b/xteve.user.service
@@ -0,0 +1,13 @@
+[Unit]
+Description = M3U Proxy for Plex DVR and Emby Live TV.
+After = network-online.target
+
+[Service]
+ExecStart = /usr/bin/xteve --config .config/xteve
+KillMode = process
+Restart = always
+RestartSec = 15
+ExecStopPost = /usr/bin/rm -rf /tmp/xteve
+
+[Install]
+WantedBy = default.target