Drop separate repository, now on Upstream version 8.0

3 files changed, 31 insertions, 113 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ccd2d4777db1..cfb99e0b37bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 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 = 20190422.91bab34
+	pkgver = 20200727.91bab34
 	pkgrel = 1
-	url = https://github.com/stefansielaff/slimserver
+	url = https://github.com/Logitech/slimserver
 	install = install
 	arch = i686
 	arch = x86_64
@@ -18,54 +18,14 @@ pkgbase = logitechmediaserver-git
 	makedepends = gd
 	makedepends = zlib
 	depends = perl>=5.26
-	depends = perl-anyevent
-	depends = perl-archive-zip
-	depends = perl-cgi
-	depends = perl-common-sense
-	depends = perl-data-dump
-	depends = perl-dbd-sqlite
-	depends = perl-dbi
-	depends = perl-digest-sha1
-	depends = perl-ev
-	depends = perl-html-form
-	depends = perl-html-parser
-	depends = perl-html-tree
-	depends = perl-http-cookies
-	depends = perl-http-daemon
-	depends = perl-http-date
-	depends = perl-http-message
-	depends = perl-json-xs
-	depends = perl-log-log4perl
-	depends = perl-lwp-mediatypes
-	depends = perl-lwp-protocol-https
-	depends = perl-module-build
-	depends = perl-net-ipv4addr
-	depends = perl-path-class
-	depends = perl-soap-lite
-	depends = perl-readonly
-	depends = perl-sub-name
-	depends = perl-sub-uplevel
-	depends = perl-template-toolkit
-	depends = perl-test-nowarnings
-	depends = perl-test-warn
-	depends = perl-text-glob
-	depends = perl-uri
-	depends = perl-xml-parser
-	depends = perl-xml-simple
-	depends = perl-yaml-libyaml
-	depends = ffmpeg
-	depends = giflib
-	depends = libexif
-	depends = libjpeg-turbo
-	depends = libpng
-	optdepends = perl-io-socket-ssl: support for https streams
+	depends = perl-io-socket-ssl
 	provides = logitechmediaserver
-	source = slimserver.tar.gz::https://github.com/stefansielaff/slimserver/archive/public/7.9.tar.gz
-	source = slimserver-vendor.tar.gz::https://github.com/stefansielaff/slimserver-vendor/archive/public/7.9.tar.gz
+	source = slimserver.tar.gz::https://github.com/Logitech/slimserver/archive/8d4c2b0b27b040f5c64313f039b64f1bd0efbaae.tar.gz
+	source = slimserver-vendor.tar.gz::https://github.com/Logitech/slimserver-vendor/archive/1a6dc71ba3470c389738fc5f127ba8a17291700b.tar.gz
 	source = service
-	sha256sums = 82a074da0756ba8f761dbf07a0958cc5fb320644a6a43a5b8db4cd388373e1b8
-	sha256sums = 2b7ae498284c970405bf053501e4a7308aa7890d84b2ca29c0b84b6a3a7692c6
-	sha256sums = f5c64f2a066914dbab9a1dd4a8ec33895645a72bde3bdbeb83c49e4624a997cb
+	sha256sums = f6a1b07d2cda5e0977e929e2e05d374546a596e11f6a83361e93cd3edbfce941
+	sha256sums = 5e5c328ce5f6174eb847f6f833b2f7f980fae967b240d3843dd65993a0ae0db3
+	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 6d81df16e41f..9603e609d691 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,94 +1,53 @@
 # Maintainer: Stefan Sielaff <aur AT stefan-sielaff DOT de>
-
 pkgname=logitechmediaserver-git
-pkgver=20190422.91bab34
-_gitver=7.9
+pkgver=20200727.91bab34
+_gitver=8.0
+_githash=8d4c2b0b27b040f5c64313f039b64f1bd0efbaae
+_githashvendor=1a6dc71ba3470c389738fc5f127ba8a17291700b
 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')
-url='https://github.com/stefansielaff/slimserver'
+url='https://github.com/Logitech/slimserver'
 license=('GPL' 'custom')
 provides=('logitechmediaserver')
-depends=('perl>=5.26'
-	 'perl-anyevent'
-	 'perl-archive-zip'
-	 'perl-cgi'
-	 'perl-common-sense'
-	 'perl-data-dump'
-	 'perl-dbd-sqlite'
-	 'perl-dbi'
-	 'perl-digest-sha1'
-	 'perl-ev'
-	 'perl-html-form'
-	 'perl-html-parser'
-	 'perl-html-tree'
-	 'perl-http-cookies'
-	 'perl-http-daemon'
-	 'perl-http-date'
-	 'perl-http-message'
-	 'perl-json-xs'
-	 'perl-log-log4perl'
-	 'perl-lwp-mediatypes'
-	 'perl-lwp-protocol-https'
-	 'perl-module-build'
-	 'perl-net-ipv4addr'
-	 'perl-path-class'
-	 'perl-soap-lite'
-	 'perl-readonly'
-	 'perl-sub-name'
-	 'perl-sub-uplevel'
-	 'perl-template-toolkit'
-	 'perl-test-nowarnings'
-	 'perl-test-warn'
-	 'perl-text-glob'
-	 'perl-uri'
-	 'perl-xml-parser'
-	 'perl-xml-simple'
-	 'perl-yaml-libyaml'
-	 'ffmpeg' 'giflib' 'libexif' 'libjpeg-turbo' 'libpng')
+depends=('perl>=5.26' 'perl-io-socket-ssl')
 makedepends=('git' 'yasm' 'rsync' 'gd' 'zlib')
-optdepends=('perl-io-socket-ssl: support for https streams')
 optdepends_x86_64=('lib32-glibc: transcoding on 64-bit systems' 'lib32-gcc-libs: transcoding on 64-bit systems')
 install=install
-source=("slimserver.tar.gz::${url}/archive/public/${_gitver}.tar.gz"
-        "slimserver-vendor.tar.gz::${url}-vendor/archive/public/${_gitver}.tar.gz"
+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"
         'service')
-sha256sums=('82a074da0756ba8f761dbf07a0958cc5fb320644a6a43a5b8db4cd388373e1b8'
-            '2b7ae498284c970405bf053501e4a7308aa7890d84b2ca29c0b84b6a3a7692c6'
-            'f5c64f2a066914dbab9a1dd4a8ec33895645a72bde3bdbeb83c49e4624a997cb')
+sha256sums=('f6a1b07d2cda5e0977e929e2e05d374546a596e11f6a83361e93cd3edbfce941'
+            '5e5c328ce5f6174eb847f6f833b2f7f980fae967b240d3843dd65993a0ae0db3'
+            '7b9cfcb0ae66d27afcaea0ab2f48f44b26a5ecbef1234aeccc4dbc63a1e6e36f')
 
 prepare() {
-	cd "${srcdir}/slimserver-public-${_gitver}"
+	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 Bin/{arm,armhf,aarch64}-linux ;;
-	    i686) rm -rf Bin/{arm,armhf,aarch64}-linux ;;
-	    aarch64) rm -rf Bin/{i386,x86_64,arm,armhf}-linux ;;
-	    arm*) rm -rf Bin/{i386,x86_64,aarch64}-linux ;;
+	    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-public-${_gitver}/CPAN"
-	mkdir _PRESERVE
-	cp -p --parents URI/Find.pm _PRESERVE
-	cp -pr --parents Net/UPnP* _PRESERVE
-	rm -f {AE.pm,AnyEvent.pm,CGI.pm,DBI.pm,Error.pm,EV.pm,JSON/XS.pm,LWP.pm,Readonly.pm,Template.pm,Text/Glob.pm,URI.pm,version.pm}
-	rm -rf {AnyEvent,Archive,CGI,common,DBI,DBD,Digest,EV,HTML,HTTP,I18N,Mac,Log,LWP,Net,Path,SOAP,Sub,Template,Test,URI,version,XML,YAML}
-	cp -rf _PRESERVE/* .
-	rm -rf _PRESERVE
-	cd "${srcdir}/slimserver-public-${_gitver}/lib"
+	cd "${srcdir}/slimserver-${_githash}/CPAN"
+	rm -rf arch
+	cd "${srcdir}/slimserver-${_githash}/lib"
 	rm -rf Audio
 }
 
 build() {
-	cd "${srcdir}/slimserver-vendor-public-${_gitver}/CPAN"
+	cd "${srcdir}/slimserver-vendor-${_githashvendor}/CPAN"
 	sh buildme.sh -t
 }
 
 package() {
         cd "${srcdir}"
         install -Dm644 service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
-        cd "${srcdir}/slimserver-public-${_gitver}"
+        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-public-${_gitver}"
+        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"
 }
diff --git a/service b/service
index 92b80a54f220..9e00d32f52f6 100644
--- a/service
+++ b/service
@@ -5,7 +5,6 @@ After=network.target
 [Service]
 User=logitechms
 Group=logitechms
-PIDFile=/var/run/lms-git.pid
 WorkingDirectory=/opt/logitechmediaserver-git
 ExecStart=/opt/logitechmediaserver-git/slimserver.pl \
 	--prefsdir /opt/logitechmediaserver-git/prefs \