Fixes by FabioLolix, thanks! Added missing build dependency nasm. Changed systemd unit file to use correct pid file

5 files changed, 45 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b6796f8dd0d8..3d5a773ca51e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,9 @@
-# Generated by mksrcinfo v8
-# Fri Oct  1 18:31:47 UTC 2021
 pkgbase = logitechmediaserver
 	pkgdesc = Slimserver for Logitech Squeezebox players. This server is also called Logitech Media Server. (Release-Version, if you prefer bleeding edge consider using logitechmediaserver-git instead)
 	pkgver = 8.2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Logitech/slimserver
-	install = install
+	install = logitechmediaserver.install
 	arch = i686
 	arch = x86_64
 	arch = arm
@@ -14,22 +12,20 @@ pkgbase = logitechmediaserver
 	arch = aarch64
 	license = GPL
 	license = custom
-	makedepends = git
+	makedepends = nasm
 	makedepends = yasm
 	makedepends = rsync
 	makedepends = gd
 	makedepends = zlib
-	depends = perl>=5.26
+	depends = perl
 	depends = perl-io-socket-ssl
-	provides = logitechmediaserver
-	source = slimserver.tar.gz::https://github.com/Logitech/slimserver/archive/8.2.0.tar.gz
-	source = slimserver-vendor-public.tar.gz::https://github.com/Logitech/slimserver-vendor/archive/public/8.0.tar.gz
-	source = service
+	source = slimserver-8.2.0.tar.gz::https://github.com/Logitech/slimserver/archive/8.2.0.tar.gz
+	source = slimserver-vendor-public-8.0.tar.gz::https://github.com/Logitech/slimserver-vendor/archive/public/8.0.tar.gz
+	source = logitechmediaserver.service
 	sha256sums = 845f11b276d3fa987d942427e10c6dece296f1e167385b19f99a2567741e7957
 	sha256sums = e13f0e3529234693953e32382776ea965b87a758d1bc75cf453819fb0d76d502
-	sha256sums = 07208896fed78eb9cb0086360c02f3226ecf1be9a061d55a6f95b9a60b6d6735
+	sha256sums = 1b89638a18511e02a298bde20bb6a6608d92fd4c1ec89028475bd569e324cb67
 	optdepends_x86_64 = lib32-glibc: transcoding on 64-bit systems
 	optdepends_x86_64 = lib32-gcc-libs: transcoding on 64-bit systems
 
 pkgname = logitechmediaserver
-
diff --git a/PKGBUILD b/PKGBUILD
index 4d82b8ab5345..44d89c6c45e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,27 @@
 # Maintainer: Stefan Sielaff <aur AT stefan-sielaff DOT de>
+
 pkgname=logitechmediaserver
 pkgver=8.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Slimserver for Logitech Squeezebox players. This server is also called Logitech Media Server. (Release-Version, if you prefer bleeding edge consider using logitechmediaserver-git instead)'
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url='https://github.com/Logitech/slimserver'
 license=('GPL' 'custom')
-provides=('logitechmediaserver')
-depends=('perl>=5.26' 'perl-io-socket-ssl')
-makedepends=('git' 'yasm' 'rsync' 'gd' 'zlib')
+depends=('perl' 'perl-io-socket-ssl')
+makedepends=('nasm' 'yasm' 'rsync' 'gd' 'zlib')
 optdepends_x86_64=('lib32-glibc: transcoding on 64-bit systems' 'lib32-gcc-libs: transcoding on 64-bit systems')
-install=install
+install=logitechmediaserver.install
 
-_gitver=8.2.0
-_gitvendorver=8.0
-source=("slimserver.tar.gz::https://github.com/Logitech/slimserver/archive/${_gitver}.tar.gz"
-        "slimserver-vendor-public.tar.gz::https://github.com/Logitech/slimserver-vendor/archive/public/${_gitvendorver}.tar.gz"
-        'service')
+_vendorver=8.0
+source=("slimserver-${pkgver}.tar.gz::https://github.com/Logitech/slimserver/archive/${pkgver}.tar.gz"
+        "slimserver-vendor-public-${_vendorver}.tar.gz::https://github.com/Logitech/slimserver-vendor/archive/public/${_vendorver}.tar.gz"
+        'logitechmediaserver.service')
 sha256sums=('845f11b276d3fa987d942427e10c6dece296f1e167385b19f99a2567741e7957'
             'e13f0e3529234693953e32382776ea965b87a758d1bc75cf453819fb0d76d502'
-            '07208896fed78eb9cb0086360c02f3226ecf1be9a061d55a6f95b9a60b6d6735')
+            '1b89638a18511e02a298bde20bb6a6608d92fd4c1ec89028475bd569e324cb67')
 
 prepare() {
-	cd "${srcdir}/slimserver-${_gitver}/Bin"
+	cd "${srcdir}/slimserver-${pkgver}/Bin"
 	rm -rf MSWin32-x86-multi-thread darwin darwin-x86_64 i386-freebsd-64int i86pc-solaris-thread-multi-64int powerpc-linux sparc-linux
 	case $CARCH in
 	    x86_64) rm -rf {arm,armhf,aarch64}-linux ;;
@@ -30,24 +29,24 @@ prepare() {
 	    aarch64) rm -rf {i386,x86_64,arm,armhf}-linux ;;
 	    arm*) rm -rf {i386,x86_64,aarch64}-linux ;;
 	esac
-	cd "${srcdir}/slimserver-${_gitver}/CPAN"
+	cd "${srcdir}/slimserver-${pkgver}/CPAN"
 	rm -rf arch
-	cd "${srcdir}/slimserver-${_gitver}/lib"
+	cd "${srcdir}/slimserver-${pkgver}/lib"
 	rm -rf Audio
 }
 
 build() {
-	cd "${srcdir}/slimserver-vendor-public-${_gitvendorver}/CPAN"
+	cd "${srcdir}/slimserver-vendor-public-${_vendorver}/CPAN"
 	sh buildme.sh -t
 }
 
 package() {
         cd "${srcdir}"
-        install -Dm644 service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
-        cd "${srcdir}/slimserver-${_gitver}"
+        install -Dm644 logitechmediaserver.service -t "${pkgdir}/usr/lib/systemd/system/"
+        cd "${srcdir}/slimserver-${pkgver}"
         install -d "${pkgdir}"/{opt,usr/share/licenses}/"${pkgname}" && ln -s "/opt/${pkgname}/License.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
         cp -a * "${pkgdir}/opt/${pkgname}"
-        cd "${srcdir}/slimserver-vendor-public-${_gitvendorver}"
+        cd "${srcdir}/slimserver-vendor-public-${_vendorver}"
         cp -a CPAN/build/5.*/lib/*/*linux*/* "${pkgdir}/opt/${pkgname}/CPAN"
-	printf "ARCH-AUR-GIT.%s\n%s" "${pkgver}" "$(date)" > "${pkgdir}/opt/${pkgname}/revision.txt"
+	printf "ARCH-AUR.%s\n%s" "${pkgver}" "$(date)" > "${pkgdir}/opt/${pkgname}/revision.txt"
 }
diff --git a/install b/logitechmediaserver.install
index fdb33d20e931..fdb33d20e931 100755
--- a/install
+++ b/logitechmediaserver.install
diff --git a/logitechmediaserver.service b/logitechmediaserver.service
new file mode 100755
index 000000000000..bce83a05bd7f
--- /dev/null
+++ b/logitechmediaserver.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Logitech Media Server Daemon
+After=network.target
+
+[Service]
+User=logitechms
+Group=logitechms
+WorkingDirectory=/opt/logitechmediaserver
+RuntimeDirectory=logitechmediaserver
+PIDFile=${RUNTIME_DIRECTORY}/slimserver.pid
+ExecStart=/opt/logitechmediaserver/slimserver.pl \
+        --prefsdir /opt/logitechmediaserver/prefs \
+        --cachedir /opt/logitechmediaserver/cache \
+        --logdir /opt/logitechmediaserver/Logs \
+        --pidfile ${RUNTIME_DIRECTORY}/slimserver.pid \
+        --noimage --novideo
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/service b/service
deleted file mode 100755
index c232b92f6e99..000000000000
--- a/service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Logitech Media Server Daemon
-After=network.target
-
-[Service]
-User=logitechms
-Group=logitechms
-PIDFile=/var/run/lms.pid
-WorkingDirectory=/opt/logitechmediaserver
-ExecStart=/opt/logitechmediaserver/slimserver.pl \
-	--prefsdir /opt/logitechmediaserver/prefs \
-	--cachedir /opt/logitechmediaserver/cache \
-	--logdir /opt/logitechmediaserver/Logs \
-	--noimage --novideo
-
-[Install]
-WantedBy=multi-user.target