Fixup PKGBUILD.

2 files changed, 37 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6cb51806be21..1eada8a34800 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mpd-git
 	pkgdesc = Flexible, powerful, server-side application for playing music (from git)
-	pkgver = 0.21.25.r1114.ge8380cf2a
+	pkgver = 0.22.1.r67.gad585e179
 	pkgrel = 1
 	url = https://www.musicpd.org/
 	arch = x86_64
@@ -26,6 +26,7 @@ pkgbase = mpd-git
 	makedepends = libpulse
 	makedepends = libsamplerate
 	makedepends = libsndfile
+	makedepends = libupnp
 	makedepends = liburing
 	makedepends = libvorbis
 	makedepends = meson
@@ -51,7 +52,6 @@ pkgbase = mpd-git
 	depends = libshout
 	depends = libsidplayfp
 	depends = libsoxr
-	depends = libupnp-git
 	depends = openal
 	depends = opus
 	depends = smbclient
@@ -72,6 +72,10 @@ pkgbase = mpd-git
 	sha256sums = f40f68205834ca53cea3372e930bfe6c2f9ecc9df3b1605df2fec63a658b2e03
 	sha256sums = 0b74c6e5db08daab3091dc15a6b0c75210ba2f9e98fa074f6cfd605a461056b6
 	sha256sums = 2faa85c12449a5b3ca422ff1c1fa06d057c7e262a74bfa6298c914a92d6f2e7a
+	b2sums = SKIP
+	b2sums = 0969a3c477b6a3f34b44e067e515d7f306414dd14e0163584417b9d071e3cc825898219f7ff66ead7905b15429b8411304052d3b2b14a72e560bfabf9bf0adcf
+	b2sums = 4ab6e415284c77802a39d0913d701fe55e56f3c22b19557661fbef77e456b5e1d151da4202695282b956602e716a7afdb994aa2fc17368b9a0d0d051d47a3afb
+	b2sums = d7b587c25dd5830c27af475a8fdd8102139d7c8fdd6f04fe23b36be030e4411582e289f575c299255ff8183096f7d47247327276f9a24641cbd032d9675b837a
 
 pkgname = mpd-git
 	depends = bzip2
@@ -92,7 +96,6 @@ pkgname = mpd-git
 	depends = libshout
 	depends = libsidplayfp
 	depends = libsoxr
-	depends = libupnp-git
 	depends = openal
 	depends = opus
 	depends = smbclient
diff --git a/PKGBUILD b/PKGBUILD
index 3c6b81e4a90f..d250d12c2b1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Amanoel Dawod <amoka at amanoel dot com>
+# Maintainer:  KokaKiwi <kokakiwi plus aur at kokakiwi dot net>
+# Contributor: Amanoel Dawod <amoka at amanoel dot com>
 # Contributor: David Runge <dvzrv@archlinux.org>
 # Contributor: E5ten <e5ten.arch@gmail.com>
 # Contributor: anna <morganamilo@gmail.com>
@@ -11,9 +12,9 @@
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: Ben <ben@benmazer.net>
 
-pkgname=mpd-git
 _pkgname=mpd
-pkgver=0.21.25.r1114.ge8380cf2a
+pkgname=${_pkgname}-git
+pkgver=0.22.1.r67.gad585e179
 pkgrel=1
 pkgdesc='Flexible, powerful, server-side application for playing music (from git)'
 url='https://www.musicpd.org/'
@@ -21,15 +22,17 @@ license=('GPL2')
 arch=('x86_64')
 depends=('bzip2' 'chromaprint' 'expat' 'gcc-libs' 'glibc' 'lame' 'libcdio'
          'libcdio-paranoia' 'libgcrypt' 'libgme' 'libmad' 'libmms' 'libmodplug'
-         'libmpcdec' 'libnfs' 'libshout' 'libsidplayfp' 'libsoxr' 'libupnp-git' 'openal'
-         'opus' 'smbclient' 'sqlite' 'wavpack' 'wildmidi' 'yajl' 'zlib' 'zziplib')
+         'libmpcdec' 'libnfs' 'libshout' 'libsidplayfp' 'libsoxr' 'openal' 'opus'
+         'smbclient' 'sqlite' 'wavpack' 'wildmidi' 'yajl' 'zlib' 'zziplib')
 makedepends=('alsa-lib' 'audiofile' 'avahi' 'boost' 'curl' 'dbus' 'faad2'
              'ffmpeg' 'flac' 'fluidsynth' 'git' 'icu' 'jack' 'libao' 'libid3tag' 'libmikmod'
-             'libmpdclient' 'libogg' 'libpulse' 'libsamplerate' 'libsndfile' 'liburing'
-             'libvorbis' 'meson' 'mpg123' 'python-sphinx' 'systemd-libs' 'twolame')
+             'libmpdclient' 'libogg' 'libpulse' 'libsamplerate' 'libsndfile' 'libupnp'
+             'liburing' 'libvorbis' 'meson' 'mpg123' 'python-sphinx' 'systemd-libs'
+             'twolame')
 provides=('mpd')
 conflicts=('mpd')
-source=("$_pkgname::git+https://github.com/MusicPlayerDaemon/MPD"
+backup=("etc/${_pkgname}.conf")
+source=("${_pkgname}::git+https://github.com/MusicPlayerDaemon/MPD"
         "${_pkgname}.conf"
         "${_pkgname}.sysusers"
         "${_pkgname}.tmpfiles")
@@ -37,22 +40,27 @@ sha256sums=('SKIP'
             'f40f68205834ca53cea3372e930bfe6c2f9ecc9df3b1605df2fec63a658b2e03'
             '0b74c6e5db08daab3091dc15a6b0c75210ba2f9e98fa074f6cfd605a461056b6'
             '2faa85c12449a5b3ca422ff1c1fa06d057c7e262a74bfa6298c914a92d6f2e7a')
-
-backup=('etc/mpd.conf')
+b2sums=('SKIP'
+        '0969a3c477b6a3f34b44e067e515d7f306414dd14e0163584417b9d071e3cc825898219f7ff66ead7905b15429b8411304052d3b2b14a72e560bfabf9bf0adcf'
+        '4ab6e415284c77802a39d0913d701fe55e56f3c22b19557661fbef77e456b5e1d151da4202695282b956602e716a7afdb994aa2fc17368b9a0d0d051d47a3afb'
+        'd7b587c25dd5830c27af475a8fdd8102139d7c8fdd6f04fe23b36be030e4411582e289f575c299255ff8183096f7d47247327276f9a24641cbd032d9675b837a')
 
 pkgver() {
 	cd "${_pkgname}"
-	git describe --long | sed 's/^v//; s/\([^-]*-g\)/r\1/; s/-/./g'
+
+	git describe --long --tags | sed 's/^v//; s/\([^-]*-g\)/r\1/; s/-/./g'
 }
 
 prepare() {
 	cd "${_pkgname}"
+
 	sed -e '/\[Service\]/a User=mpd' \
 		-i "systemd/system/mpd.service.in"
 }
 
 build() {
   cd "${_pkgname}"
+
   # NOTE: sndio conflicts with alsa
   # TODO: package adplug
   # TODO: package shine
@@ -75,19 +83,23 @@ build() {
 
 check() {
   cd "${_pkgname}"
+
   ninja -C build test
 }
 
 package() {
   depends+=('libFLAC.so' 'libao.so' 'libasound.so' 'libaudiofile.so'
-  'libavahi-client.so' 'libavahi-common.so' 'libavcodec.so' 'libavformat.so'
-  'libavutil.so' 'libcurl.so' 'libdbus-1.so' 'libfaad.so' 'libfluidsynth.so'
-  'libicui18n.so' 'libicuuc.so' 'libid3tag.so' 'libjack.so' 'libmikmod.so'
-  'libmpdclient.so' 'libmpg123.so' 'libogg.so' 'libpulse.so' 'libsamplerate.so'
-  'libsndfile.so' 'libsystemd.so' 'libtwolame.so' 'libvorbis.so'
-  'libvorbisenc.so')
+            'libavahi-client.so' 'libavahi-common.so' 'libavcodec.so' 'libavformat.so'
+            'libavutil.so' 'libcurl.so' 'libdbus-1.so' 'libfaad.so' 'libfluidsynth.so'
+            'libicui18n.so' 'libicuuc.so' 'libid3tag.so' 'libjack.so' 'libmikmod.so'
+            'libmpdclient.so' 'libmpg123.so' 'libogg.so' 'libpulse.so' 'libsamplerate.so'
+            'libsndfile.so' 'libsystemd.so' 'libtwolame.so' 'libvorbis.so'
+            'libvorbisenc.so')
+
   cd "${_pkgname}"
+
   DESTDIR="${pkgdir}" ninja -C build install
+
   install -vDm 644 "doc/${_pkgname}conf.example" \
     -t "${pkgdir}/usr/share/doc/${_pkgname}/"
   install -vDm 644 "doc/${_pkgname}.conf.5.rst" -t "${pkgdir}/usr/share/man/man5/"
@@ -96,4 +108,6 @@ package() {
   install -vDm 644 "../${_pkgname}.conf" -t "${pkgdir}/etc/"
   install -vDm 644 "../${_pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${_pkgname}.conf"
   install -vDm 644 "../${_pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${_pkgname}.conf"
+
+  install -vDm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }