Change to real git clone, added nasm dependency

2 files changed, 37 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0110d6bb7b1c..54fffaa01db3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = logitechmediaserver-git
 	pkgdesc = Slimserver for Logitech Squeezebox players. This server is also called Logitech Media Server. (Git-Version, if you prefer stability consider using logitechmediaserver instead)
-	pkgver = 20210126.9f548f9
+	pkgver = 20210327.21451_359cd3a1d
 	pkgrel = 1
 	url = https://github.com/Logitech/slimserver
 	install = install
@@ -13,6 +13,7 @@ pkgbase = logitechmediaserver-git
 	license = GPL
 	license = custom
 	makedepends = git
+	makedepends = nasm
 	makedepends = yasm
 	makedepends = rsync
 	makedepends = gd
@@ -20,11 +21,11 @@ pkgbase = logitechmediaserver-git
 	depends = perl>=5.26
 	depends = perl-io-socket-ssl
 	provides = logitechmediaserver
-	source = slimserver.tar.gz::https://github.com/Logitech/slimserver/archive/9f548f9b711a469bd3cb7b92a776b0c9f9005ce7.tar.gz
-	source = slimserver-vendor.tar.gz::https://github.com/Logitech/slimserver-vendor/archive/c2162d0abc5f213421a171d3781805642673d9a0.tar.gz
+	source = git+https://github.com/Logitech/slimserver.git
+	source = git+https://github.com/Logitech/slimserver-vendor.git
 	source = service
-	sha256sums = fca1c4277fa9c63f513de8fc6b4495cfa6ed16bd8ff45ad70b969e8a3054a2bf
-	sha256sums = f82930bb8965ea9d9bec9344148a157296b2bad97426e799b30d8eb074973b56
+	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = 7b9cfcb0ae66d27afcaea0ab2f48f44b26a5ecbef1234aeccc4dbc63a1e6e36f
 	optdepends_x86_64 = lib32-glibc: transcoding on 64-bit systems
 	optdepends_x86_64 = lib32-gcc-libs: transcoding on 64-bit systems
diff --git a/PKGBUILD b/PKGBUILD
index 717d4555ec73..3286589556d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Stefan Sielaff <aur AT stefan-sielaff DOT de>
 pkgname=logitechmediaserver-git
-pkgver=20210126.9f548f9
+pkgver=20210327.21451_359cd3a1d
 pkgrel=1
 pkgdesc='Slimserver for Logitech Squeezebox players. This server is also called Logitech Media Server. (Git-Version, if you prefer stability consider using logitechmediaserver instead)'
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
@@ -8,51 +8,49 @@ 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')
+makedepends=('git' '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
 
-_gitver=8.1.1
-_githash=9f548f9b711a469bd3cb7b92a776b0c9f9005ce7
-_githashvendor=c2162d0abc5f213421a171d3781805642673d9a0
-source=("slimserver.tar.gz::https://github.com/Logitech/slimserver/archive/${_githash}.tar.gz"
-        "slimserver-vendor.tar.gz::https://github.com/Logitech/slimserver-vendor/archive/${_githashvendor}.tar.gz"
+source=("git+https://github.com/Logitech/slimserver.git"
+        "git+https://github.com/Logitech/slimserver-vendor.git"
         'service')
-sha256sums=('fca1c4277fa9c63f513de8fc6b4495cfa6ed16bd8ff45ad70b969e8a3054a2bf'
-            'f82930bb8965ea9d9bec9344148a157296b2bad97426e799b30d8eb074973b56'
+sha256sums=('SKIP'
+            'SKIP'
             '7b9cfcb0ae66d27afcaea0ab2f48f44b26a5ecbef1234aeccc4dbc63a1e6e36f')
 
 prepare() {
-	cd "${srcdir}/slimserver-${_githash}/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 ;;
-	    i686) rm -rf {arm,armhf,aarch64}-linux ;;
-	    aarch64) rm -rf {i386,x86_64,arm,armhf}-linux ;;
-	    arm*) rm -rf {i386,x86_64,aarch64}-linux ;;
-	esac
-	cd "${srcdir}/slimserver-${_githash}/CPAN"
-	rm -rf arch
-	cd "${srcdir}/slimserver-${_githash}/lib"
-	rm -rf Audio
+    cd "${srcdir}/${url##*/}/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 ;;
+	i686) rm -rf {arm,armhf,aarch64}-linux ;;
+	aarch64) rm -rf {i386,x86_64,arm,armhf}-linux ;;
+	arm*) rm -rf {i386,x86_64,aarch64}-linux ;;
+    esac
+    cd "${srcdir}/${url##*/}/CPAN"
+    rm -rf arch
+    cd "${srcdir}/${url##*/}/lib"
+    rm -rf Audio
 }
 
 build() {
-	cd "${srcdir}/slimserver-vendor-${_githashvendor}/CPAN"
-	sh buildme.sh -t
+    cd "${srcdir}/${url##*/}-vendor/CPAN"
+    sh buildme.sh -t
 }
 
 package() {
-        cd "${srcdir}"
-        install -Dm644 service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
-        cd "${srcdir}/slimserver-${_githash}"
-        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-${_githashvendor}"
-        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"
+    cd "${srcdir}"
+    install -Dm644 service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+    cd "${srcdir}/${url##*/}"
+    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}/${url##*/}-vendor"
+    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"
 }
 
 pkgver() {
-    printf "%s.%s" "$(date +%Y%m%d)" "$(git ls-remote ${url} HEAD | cut -c 1-7)"
-}
+    cd "${url##*/}"
+    printf "%s.%s.%s" "$(date +%Y%m%d)" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
\ No newline at end of file