update to 0.21.3

2 files changed, 88 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d70b12b5e5e..aa3569e9e6a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,49 +1,58 @@
 pkgbase = mpd-sidplay
 	pkgdesc = Flexible, powerful, server-side application for playing music - built with sidplay support
-	pkgver = 0.20.21
+	pkgver = 0.21.3
 	pkgrel = 1
 	url = https://www.musicpd.org/
 	arch = x86_64
 	license = GPL
 	makedepends = boost
-	makedepends = doxygen
-	depends = libao
-	depends = ffmpeg
-	depends = libmodplug
+	makedepends = meson
+	makedepends = python-sphinx
 	depends = audiofile
-	depends = libshout
-	depends = libmad
+	depends = avahi
 	depends = curl
 	depends = faad2
-	depends = sqlite
+	depends = ffmpeg
+	depends = fluidsynth
+	depends = icu
 	depends = jack
-	depends = libmms
-	depends = wavpack
-	depends = avahi
+	depends = libao
+	depends = libcdio-paranoia
+	depends = libgme
 	depends = libid3tag
-	depends = yajl
+	depends = libmad
+	depends = libmikmod
+	depends = libmms
+	depends = libmodplug
+	depends = libmpcdec
 	depends = libmpdclient
-	depends = icu
-	depends = libupnp
 	depends = libnfs
 	depends = libsamplerate
+	depends = libshout
+	depends = libsidplayfp
 	depends = libsoxr
+	depends = libsystemd
+	depends = libupnp
+	depends = mpg123
+	depends = openal
 	depends = smbclient
-	depends = libgme
+	depends = sqlite
+	depends = twolame
+	depends = wavpack
+	depends = wildmidi
+	depends = yajl
 	depends = zziplib
-	depends = libsystemd
-	depends = libsidplayfp
-	provides = mpd=0.20.21
+	provides = mpd=0.21.3
 	conflicts = mpd
 	replaces = mpd
 	backup = etc/mpd.conf
-	source = https://www.musicpd.org/download/mpd/0.20/mpd-0.20.21.tar.xz
-	source = https://www.musicpd.org/download/mpd/0.20/mpd-0.20.21.tar.xz.sig
+	source = https://www.musicpd.org/download/mpd/0.21/mpd-0.21.3.tar.xz
+	source = https://www.musicpd.org/download/mpd/0.21/mpd-0.21.3.tar.xz.sig
 	source = tmpfiles.d
 	source = sysusers.d
 	source = mpd.conf
 	validpgpkeys = 0392335A78083894A4301C43236E8A58C6DB4512
-	sha256sums = 8322764dc265c20f05c8c8fdfdd578b0722e74626bef56fcd8eebfb01acc58dc
+	sha256sums = 6cf60e644870c6063a008d833a6c876272b7679a400b83012ed209c15ce06e2a
 	sha256sums = SKIP
 	sha256sums = e09e38ab5fd6e8b3b3e6e5a48d837c164ad37aec7e6762a78810c34fe9abf3a1
 	sha256sums = 2679014448e9352e20e85d8d76b021aeebe27bdf6100b24577afee2f37522a95
diff --git a/PKGBUILD b/PKGBUILD
index 802eddf65637..408fed462aa6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,49 @@
 # Maintainer: Max Beck <rytonemail@gmail.com>
 pkgname=mpd-sidplay
 _pkgname=mpd
-pkgver=0.20.21
+pkgver=0.21.3
 pkgrel=1
 pkgdesc="Flexible, powerful, server-side application for playing music - built with sidplay support"
 url="https://www.musicpd.org/"
 license=("GPL")
 arch=("x86_64")
 depends=(
-    "libao"
-    "ffmpeg"
-    "libmodplug"
     "audiofile"
-    "libshout"
-    "libmad"
+    "avahi"
     "curl"
     "faad2"
-    "sqlite"
+    "ffmpeg"
+    "fluidsynth"
+    "icu"
     "jack"
-    "libmms"
-    "wavpack"
-    "avahi"
+    "libao"
+    "libcdio-paranoia"
+    "libgme"
     "libid3tag"
-    "yajl"
+    "libmad"
+    "libmikmod"
+    "libmms"
+    "libmodplug"
+    "libmpcdec"
     "libmpdclient"
-    "icu"
-    "libupnp"
     "libnfs"
     "libsamplerate"
+    "libshout"
+    "libsidplayfp"
     "libsoxr"
+    "libsystemd"
+    "libupnp"
+    "mpg123"
+    "openal"
     "smbclient"
-    "libgme"
+    "sqlite"
+    "twolame"
+    "wavpack"
+    "wildmidi"
+    "yajl"
     "zziplib"
-    "libsystemd"
-    "libsidplayfp"
 )
-makedepends=("boost" "doxygen")
+makedepends=("boost" "meson" "python-sphinx")
 validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512')
 provides=("mpd=$pkgver")
 conflicts=("mpd")
@@ -46,40 +54,45 @@ source=(
     "sysusers.d"
     "mpd.conf"
 )
-sha256sums=(
-    "8322764dc265c20f05c8c8fdfdd578b0722e74626bef56fcd8eebfb01acc58dc" "SKIP"
-    "e09e38ab5fd6e8b3b3e6e5a48d837c164ad37aec7e6762a78810c34fe9abf3a1"
-    "2679014448e9352e20e85d8d76b021aeebe27bdf6100b24577afee2f37522a95"
-    "a30c2c43824b540300cc83505c146989b415189bd90f191aebaed6f13556e6d2"
-)
+sha256sums=('6cf60e644870c6063a008d833a6c876272b7679a400b83012ed209c15ce06e2a'
+            'SKIP'
+            'e09e38ab5fd6e8b3b3e6e5a48d837c164ad37aec7e6762a78810c34fe9abf3a1'
+            '2679014448e9352e20e85d8d76b021aeebe27bdf6100b24577afee2f37522a95'
+            'a30c2c43824b540300cc83505c146989b415189bd90f191aebaed6f13556e6d2')
 backup=("etc/mpd.conf")
 
 build() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-    ./configure \
-        --prefix=/usr \
-        --sysconfdir=/etc \
-        --enable-jack \
-        --enable-libmpdclient \
-        --enable-pipe-output \
-        --enable-pulse \
-        --enable-soundcloud \
-        --enable-zzip \
-        --enable-sidplay \
-        --with-systemduserunitdir=/usr/lib/systemd/user \
-        --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    
-    make
+    cd "${srcdir}/${_pkgname}-${pkgver}/build"
+
+    _opts=(
+        "-Ddocumentation=true"
+        "-Dchromaprint=disabled"
+        "-Dsidplay=enabled"
+        "-Dlibwrap=disabled"
+        "-Dadplug=disabled"
+        "-Dsndio=disabled"
+        "-Dshine=disabled"
+    )
+    arch-meson .. ${_opts[@]}
+    ninja
+
 }
 
 package() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${_pkgname}-${pkgver}/build"
+
+    DESTDIR="${pkgdir}" ninja install
+
+    install -Dm644 ../doc/mpdconf.example "${pkgdir}"/usr/shade/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/man1/mpd.1
 
-    make DESTDIR="${pkgdir}" install
-    install -Dm644 ../mpd.conf "${pkgdir}"/etc/mpd.conf
-    install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf
-    install -Dm644 ../sysusers.d "${pkgdir}"/usr/lib/sysusers.d/mpd.conf
+    install -Dm644 ../../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf
+    install -Dm644 ../../sysusers.d "${pkgdir}"/usr/lib/sysusers.d/mpd.conf
+    install -Dm644 ../../mpd.conf "${pkgdir}"/etc/mpd.conf
 
-    sed '/\[Service\]/a User=mpd' -i "${pkgdir}"/usr/lib/systemd/system/mpd.service
-    sed '/WantedBy=/c WantedBy=default.target' -i "${pkgdir}"/usr/lib/systemd/system/mpd.service
+    sed \
+        -e "/\[Service\]/a User=mpd" \
+        -e "/WantedBy=/c WantedBy=default.target" \
+        -i "${pkgdir}"/usr/lib/systemd/system/mpd.service
 }