upgpkg: mpd-server-minimal 0.22-1

upstream release

2 files changed, 36 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 321e423399c2..17b058e82ff2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mpd-server-minimal
 	pkgdesc = Flexible, powerful, server-side application for playing music. Minimal version with only flac playback as server running under mpd user.
-	pkgver = 0.21.20
+	pkgver = 0.22
 	pkgrel = 1
 	url = https://www.musicpd.org/
 	arch = i686
@@ -9,22 +9,25 @@ pkgbase = mpd-server-minimal
 	license = GPL
 	makedepends = boost
 	makedepends = meson
+	makedepends = python-sphinx
+	makedepends = systemd
 	depends = alsa-lib
 	depends = flac
 	depends = icu
 	depends = libmpdclient
+	depends = liburing
 	depends = systemd-libs
 	depends = zlib
-	provides = mpd=0.21.20
+	provides = mpd=0.22
 	conflicts = mpd
 	backup = etc/mpd.conf
-	source = https://www.musicpd.org//download/mpd/0.21/mpd-0.21.20.tar.xz
-	source = https://www.musicpd.org//download/mpd/0.21/mpd-0.21.20.tar.xz.sig
+	source = https://www.musicpd.org//download/mpd/0.22/mpd-0.22.tar.xz
+	source = https://www.musicpd.org//download/mpd/0.22/mpd-0.22.tar.xz.sig
 	source = mpd.tmpfiles
 	source = mpd.sysusers
 	source = mpd.conf
 	validpgpkeys = 0392335A78083894A4301C43236E8A58C6DB4512
-	sha256sums = 422ef0a996d961f3ebc6856395f3a855b45fa0059910e878fb98281007e510e1
+	sha256sums = 7de742d925d01bf52685cc6cbb31fdeb671e4992a448720897ef706e57e39076
 	sha256sums = SKIP
 	sha256sums = 93d5cd794c3b2709d24dd77900574683b04fa382c7eb0a2d26ddb51cbcf7adbf
 	sha256sums = 14d28690bb60d8d182499ebefa583fc42f425093ef00341be25bb66586aecf3d
diff --git a/PKGBUILD b/PKGBUILD
index 31d25ce44bd5..a442869edff3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,44 @@
-# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <bruno.n.pagani@gmail.com>
+# Maintainer: Bruno Pagani <archange@archlinux.org>
 
 _pkgname=mpd
 pkgname=${_pkgname}-server-minimal
-pkgver=0.21.20
+pkgver=0.22
 pkgrel=1
 pkgdesc="Flexible, powerful, server-side application for playing music. Minimal version with only flac playback as server running under mpd user."
 arch=(i686 x86_64 armv7h)
 url="https://www.musicpd.org/"
 license=(GPL)
-depends=(alsa-lib flac icu libmpdclient systemd-libs zlib)
-makedepends=(boost meson)
-provides=("${_pkgname}=$pkgver")
-conflicts=("${_pkgname}")
-backup=("etc/${_pkgname}.conf")
-source=("${url}/download/${_pkgname}/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz"{,.sig}
-        "${_pkgname}.tmpfiles"
-        "${_pkgname}.sysusers"
-        "${_pkgname}.conf")
-sha256sums=('422ef0a996d961f3ebc6856395f3a855b45fa0059910e878fb98281007e510e1'
-            'SKIP'
-            '93d5cd794c3b2709d24dd77900574683b04fa382c7eb0a2d26ddb51cbcf7adbf'
-            '14d28690bb60d8d182499ebefa583fc42f425093ef00341be25bb66586aecf3d'
-            'f40f68205834ca53cea3372e930bfe6c2f9ecc9df3b1605df2fec63a658b2e03')
+depends=(alsa-lib flac icu libmpdclient liburing systemd-libs zlib)
+makedepends=(boost meson python-sphinx systemd)
+provides=("${_pkgname}=${pkgver}")
+conflicts=(${_pkgname})
+backup=(etc/${_pkgname}.conf)
+source=("${url}/download/${_pkgname}/${pkgver:0:4}/${_pkgname}-${pkgver}.tar.xz"{,.sig}
+        ${_pkgname}.tmpfiles
+        ${_pkgname}.sysusers
+        ${_pkgname}.conf)
+sha256sums=(7de742d925d01bf52685cc6cbb31fdeb671e4992a448720897ef706e57e39076
+            SKIP
+            93d5cd794c3b2709d24dd77900574683b04fa382c7eb0a2d26ddb51cbcf7adbf
+            14d28690bb60d8d182499ebefa583fc42f425093ef00341be25bb66586aecf3d
+            f40f68205834ca53cea3372e930bfe6c2f9ecc9df3b1605df2fec63a658b2e03)
 validpgpkeys=(0392335A78083894A4301C43236E8A58C6DB4512) # Max Kellermann <max@musicpd.org>
 
 prepare() {
     cd ${_pkgname}-${pkgver}
-    rm -rf build
-    install -d build
-    sed -e '/\[Service\]/a User=mpd' -e '/WantedBy=/c WantedBy=default.target' -i systemd/system/${_pkgname}.service.in
+    sed -e '/\[Service\]/a User=mpd' -i systemd/system/${_pkgname}.service.in
 }
 
 build() {
-    cd ${_pkgname}-${pkgver}/build
-
-    _opts=('-Ddocumentation=false'
+    cd ${_pkgname}-${pkgver}
+    sed -i "s|get_option('html_manual')|get_option('html_manual') and not get_option('manpages')|" doc/meson.build
+    _opts=('-Ddocumentation=enabled'
+           '-Dhtml_manual=false'
+           '-Dmanpages=true'
            '-Dtest=false'
            '-Dsyslog=disabled'
            '-Dinotify=true'
+           '-Dio_uring=enabled'
            '-Ddaemon=true'
            '-Dsystemd=enabled'
            '-Dtcp=true'
@@ -114,18 +115,16 @@ build() {
            '-Dzeroconf=disabled'
     )
 
-    arch-meson .. ${_opts[@]}
-    ninja
+    arch-meson ${_opts[@]} build
+    ninja -C build
 }
 
 package() {
-    cd ${_pkgname}-${pkgver}/build
+    cd ${_pkgname}-${pkgver}
 
-    DESTDIR="${pkgdir}" ninja install
+    DESTDIR="${pkgdir}" ninja -C build install
 
-    install -Dm644 ../doc/mpdconf.example "${pkgdir}"/usr/share/doc/mpd/mpdconf.example
-    install -Dm644 ../doc/mpd.conf.5 "${pkgdir}"/usr/share/man/man5/mpd.conf.5
-    install -Dm644 ../doc/mpd.1 "${pkgdir}"/usr/share/man/man1/mpd.1
+    install -Dm644 doc/mpdconf.example -t "${pkgdir}"/usr/share/doc/mpd/
 
     install -Dm644 "${srcdir}"/${_pkgname}.conf "${pkgdir}"/etc/${_pkgname}.conf
     install -Dm644 "${srcdir}"/${_pkgname}.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${_pkgname}.conf