0.23.13

3 files changed, 213 insertions, 96 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ebd352339e0..a308d08331c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mpd-smbclient
 	pkgdesc = Flexible, powerful, server-side application for playing music (with buggy smbclient plugin enabled, don't complain upstream!)
-	pkgver = 0.23.12
+	pkgver = 0.23.13
 	pkgrel = 1
 	url = https://www.musicpd.org/
 	arch = x86_64
@@ -10,6 +10,8 @@ pkgbase = mpd-smbclient
 	makedepends = audiofile
 	makedepends = avahi
 	makedepends = boost
+	makedepends = bzip2
+	makedepends = chromaprint
 	makedepends = curl
 	makedepends = dbus
 	makedepends = expat
@@ -20,6 +22,7 @@ pkgbase = mpd-smbclient
 	makedepends = fmt
 	makedepends = icu
 	makedepends = jack
+	makedepends = lame
 	makedepends = libao
 	makedepends = libid3tag
 	makedepends = libmikmod
@@ -34,19 +37,19 @@ pkgbase = mpd-smbclient
 	makedepends = libvorbis
 	makedepends = meson
 	makedepends = mpg123
-	makedepends = pipewire
+	makedepends = openal
+	makedepends = opus
+	makedepends = libpipewire
 	makedepends = python-sphinx
-	makedepends = systemd-libs
+	makedepends = sqlite
+	makedepends = systemd
 	makedepends = twolame
 	makedepends = yajl
-	depends = bzip2
-	depends = chromaprint
 	depends = gcc-libs
 	depends = glibc
-	depends = lame
+	depends = hicolor-icon-theme
 	depends = libcdio
 	depends = libcdio-paranoia
-	depends = libgcrypt
 	depends = libgme
 	depends = libmad
 	depends = libmms
@@ -56,43 +59,41 @@ pkgbase = mpd-smbclient
 	depends = libshout
 	depends = libsidplayfp
 	depends = libsoxr
-	depends = openal
-	depends = opus
 	depends = smbclient
-	depends = sqlite
+	depends = pcre2
 	depends = wavpack
 	depends = wildmidi
 	depends = zlib
 	depends = zziplib
 	provides = mpd
 	conflicts = mpd
-	backup = etc/mpd.conf
-	source = https://www.musicpd.org/download/mpd/0.23/mpd-0.23.12.tar.xz
-	source = https://www.musicpd.org/download/mpd/0.23/mpd-0.23.12.tar.xz.sig
+	backup = etc/mpd-smbclient.conf
+	source = https://www.musicpd.org/download/mpd/0.23/mpd-0.23.13.tar.xz
+	source = https://www.musicpd.org/download/mpd/0.23/mpd-0.23.13.tar.xz.sig
 	source = mpd.conf
 	source = mpd.sysusers
 	source = mpd.tmpfiles
+	source = mpd.service.override
 	validpgpkeys = 0392335A78083894A4301C43236E8A58C6DB4512
-	sha512sums = 54495b839d86b47ae6e2f6cf4e1baebd0e8eb924742e9db42cc7462ffc4b6f650b83f3eaea291fe905ff5f1975cf875537ffd23a111724013ce58e6df26ce36e
+	sha512sums = 1ef2b3a2089aa6078a455e43a2fb9097dc0d5b27b170e6d64e416d5e82349a794eb0acf8db72a975ad024083e872e4a1bd0e0fd51302d327d373b61f01bb819d
 	sha512sums = SKIP
 	sha512sums = 25a823740d92da8e186916701413114142eb6ad91a172c592e68b569c8e4f50fa99580e555ccf6cd31fc4f55a09bfe0278efa46e4e76ee0fe02846292fadf3c1
 	sha512sums = 6e467481406279767b709ec6d5c06dbd825c0de09045c52ffa2d21d0604dcfe19b7a92bf42bed25163d66a3a0d1dbde6185a648b433eaf5eac56be90491e2e18
 	sha512sums = db473db27cd68994c3ee26e78e0fb34d13126301d8861563dcc12a22d62ecb14c4ffb1e0798c6aaccdff34e73bae3fbeeff7b42606c901a2d35e278865cdf35d
-	b2sums = b218d9f477e92842638e3fba44c84957a3f656adaaf1ece998847db8d64883b8c997703206f74b37043888757f5f628799a3a35b25ea991f9ad00df1c4ad5e71
+	sha512sums = c1782b82f9db1d30aece43a07230c5d57370f2494a16e108af03815d83968805472f10f53ea5495cf0e08ff8f245430c3c3bc44025af43aaf9ecd12fcd6afc6c
+	b2sums = 02907f08cc504d0fbf703179b333b301c7ad8fc8535d85305faa7962dd7faa164f4492286902cb48eaf3db2a1445b541b1261c18a89ca8a73e80016af9581e26
 	b2sums = SKIP
 	b2sums = 0969a3c477b6a3f34b44e067e515d7f306414dd14e0163584417b9d071e3cc825898219f7ff66ead7905b15429b8411304052d3b2b14a72e560bfabf9bf0adcf
 	b2sums = 4ab6e415284c77802a39d0913d701fe55e56f3c22b19557661fbef77e456b5e1d151da4202695282b956602e716a7afdb994aa2fc17368b9a0d0d051d47a3afb
 	b2sums = d7b587c25dd5830c27af475a8fdd8102139d7c8fdd6f04fe23b36be030e4411582e289f575c299255ff8183096f7d47247327276f9a24641cbd032d9675b837a
+	b2sums = 753664445d7d5cc0b36f51ac66549beea403b9731cbcb81b0a782974a0a73d90559ba93e6afcaa470b6f2f5a844c09ef695bdf3b1e6dfee97aa080f41b7fe513
 
 pkgname = mpd-smbclient
-	depends = bzip2
-	depends = chromaprint
 	depends = gcc-libs
 	depends = glibc
-	depends = lame
+	depends = hicolor-icon-theme
 	depends = libcdio
 	depends = libcdio-paranoia
-	depends = libgcrypt
 	depends = libgme
 	depends = libmad
 	depends = libmms
@@ -102,50 +103,88 @@ pkgname = mpd-smbclient
 	depends = libshout
 	depends = libsidplayfp
 	depends = libsoxr
-	depends = openal
-	depends = opus
 	depends = smbclient
-	depends = sqlite
+	depends = pcre2
 	depends = wavpack
 	depends = wildmidi
 	depends = zlib
 	depends = zziplib
-	depends = libbz2.so
-	depends = libFLAC.so
-	depends = libao.so
+	depends = alsa-lib
 	depends = libasound.so
+	depends = audiofile
 	depends = libaudiofile.so
+	depends = avahi
 	depends = libavahi-client.so
 	depends = libavahi-common.so
-	depends = libavcodec.so
-	depends = libavformat.so
-	depends = libavutil.so
+	depends = bzip2
+	depends = libbz2.so
+	depends = chromaprint
+	depends = libchromaprint.so
+	depends = curl
 	depends = libcurl.so
+	depends = dbus
 	depends = libdbus-1.so
+	depends = expat
 	depends = libexpat.so
+	depends = faad2
 	depends = libfaad.so
+	depends = ffmpeg
+	depends = libavcodec.so
+	depends = libavfilter.so
+	depends = libavformat.so
+	depends = libavutil.so
+	depends = flac
+	depends = libFLAC.so
+	depends = fluidsynth
 	depends = libfluidsynth.so
+	depends = fmt
 	depends = libfmt.so
+	depends = icu
 	depends = libicui18n.so
 	depends = libicuuc.so
-	depends = libid3tag.so
+	depends = jack
 	depends = libjack.so
+	depends = lame
+	depends = libmp3lame.so
+	depends = libao
+	depends = libao.so
+	depends = libid3tag
+	depends = libid3tag.so
+	depends = libmikmod
 	depends = libmikmod.so
+	depends = libmpdclient
 	depends = libmpdclient.so
-	depends = libmpg123.so
+	depends = libogg
 	depends = libogg.so
+	depends = libopenmpt
 	depends = libopenmpt.so
+	depends = libpipewire
 	depends = libpipewire-0.3.so
+	depends = libpulse
 	depends = libpulse.so
+	depends = libsamplerate
 	depends = libsamplerate.so
+	depends = libsndfile
 	depends = libsndfile.so
-	depends = libsystemd.so
-	depends = libtwolame.so
+	depends = libupnp
+	depends = libixml.so
 	depends = libupnp.so
+	depends = liburing
 	depends = liburing.so
+	depends = libvorbis
 	depends = libvorbis.so
 	depends = libvorbisenc.so
+	depends = mpg123
+	depends = libmpg123.so
+	depends = openal
+	depends = libopenal.so
+	depends = opus
+	depends = libopus.so
+	depends = sqlite
+	depends = libsqlite3.so
+	depends = systemd-libs
+	depends = libsystemd.so
+	depends = twolame
+	depends = libtwolame.so
+	depends = yajl
 	depends = libyajl.so
-	depends = libavfilter.so
-	depends = libchromaprint.so
-	depends = libixml.so
diff --git a/PKGBUILD b/PKGBUILD
index 46ea50d50646..5f4e8990cf96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: jakob <grandchild@mailbox.org>
 # Contributor: David Runge <dvzrv@archlinux.org>
+# Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -8,90 +9,165 @@
 
 _pkgname=mpd
 pkgname=${_pkgname}-smbclient
-pkgver=0.23.12
+pkgver=0.23.13
 pkgrel=1
 pkgdesc="Flexible, powerful, server-side application for playing music (with buggy smbclient plugin enabled, don't complain upstream!)"
-url="https://www.musicpd.org/"
-license=('GPL2')
 arch=('x86_64' 'aarch64')
-depends=('bzip2' 'chromaprint' 'gcc-libs' 'glibc' 'lame' 'libcdio'
-'libcdio-paranoia' 'libgcrypt' 'libgme' 'libmad' 'libmms' 'libmodplug'
-'libmpcdec' 'libnfs' 'libshout' 'libsidplayfp' 'libsoxr' 'openal' 'opus'
-'smbclient' 'sqlite' 'wavpack' 'wildmidi' 'zlib' 'zziplib')
-makedepends=('alsa-lib' 'audiofile' 'avahi' 'boost' 'curl' 'dbus' 'expat'
-'faad2' 'ffmpeg' 'flac' 'fluidsynth' 'fmt' 'icu' 'jack' 'libao' 'libid3tag'
-'libmikmod' 'libmpdclient' 'libogg' 'libopenmpt' 'libpulse' 'libsamplerate'
-'libsndfile' 'libupnp' 'liburing' 'libvorbis' 'meson' 'mpg123' 'pipewire'
-'python-sphinx' 'systemd-libs' 'twolame' 'yajl')
+url="https://www.musicpd.org/"
+license=(GPL2)
+depends=(
+  gcc-libs
+  glibc
+  hicolor-icon-theme
+  libcdio
+  libcdio-paranoia
+  libgme
+  libmad
+  libmms
+  libmodplug
+  libmpcdec
+  libnfs
+  libshout
+  libsidplayfp
+  libsoxr
+  smbclient  # Enabled despite https://bugzilla.samba.org/show_bug.cgi?id=11413 - the point of this package
+  pcre2
+  wavpack
+  wildmidi
+  zlib
+  zziplib
+)
+makedepends=(
+  alsa-lib
+  audiofile
+  avahi
+  boost
+  bzip2
+  chromaprint
+  curl
+  dbus
+  expat
+  faad2
+  ffmpeg
+  flac
+  fluidsynth
+  fmt
+  icu
+  jack
+  lame
+  libao
+  libid3tag
+  libmikmod
+  libmpdclient
+  libogg
+  libopenmpt
+  libpulse
+  libsamplerate
+  libsndfile
+  libupnp
+  liburing
+  libvorbis
+  meson
+  mpg123
+  openal
+  opus
+  libpipewire
+  python-sphinx
+  sqlite
+  systemd
+  twolame
+  yajl
+)
 provides=('mpd')
 conflicts=('mpd')
-backup=("etc/${_pkgname}.conf")
-source=("https://www.musicpd.org/download/${_pkgname}/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz"{,.sig}
-        "${_pkgname}.conf"
-        "${_pkgname}.sysusers"
-        "${_pkgname}.tmpfiles")
-sha512sums=('54495b839d86b47ae6e2f6cf4e1baebd0e8eb924742e9db42cc7462ffc4b6f650b83f3eaea291fe905ff5f1975cf875537ffd23a111724013ce58e6df26ce36e'
+backup=(etc/$pkgname.conf)
+source=(
+  https://www.musicpd.org/download/${_pkgname}/${pkgver%.*}/${_pkgname}-$pkgver.tar.xz{,.sig}
+  ${_pkgname}.conf
+  ${_pkgname}.sysusers
+  ${_pkgname}.tmpfiles
+  ${_pkgname}.service.override
+)
+sha512sums=('1ef2b3a2089aa6078a455e43a2fb9097dc0d5b27b170e6d64e416d5e82349a794eb0acf8db72a975ad024083e872e4a1bd0e0fd51302d327d373b61f01bb819d'
             'SKIP'
             '25a823740d92da8e186916701413114142eb6ad91a172c592e68b569c8e4f50fa99580e555ccf6cd31fc4f55a09bfe0278efa46e4e76ee0fe02846292fadf3c1'
             '6e467481406279767b709ec6d5c06dbd825c0de09045c52ffa2d21d0604dcfe19b7a92bf42bed25163d66a3a0d1dbde6185a648b433eaf5eac56be90491e2e18'
-            'db473db27cd68994c3ee26e78e0fb34d13126301d8861563dcc12a22d62ecb14c4ffb1e0798c6aaccdff34e73bae3fbeeff7b42606c901a2d35e278865cdf35d')
-b2sums=('b218d9f477e92842638e3fba44c84957a3f656adaaf1ece998847db8d64883b8c997703206f74b37043888757f5f628799a3a35b25ea991f9ad00df1c4ad5e71'
+            'db473db27cd68994c3ee26e78e0fb34d13126301d8861563dcc12a22d62ecb14c4ffb1e0798c6aaccdff34e73bae3fbeeff7b42606c901a2d35e278865cdf35d'
+            'c1782b82f9db1d30aece43a07230c5d57370f2494a16e108af03815d83968805472f10f53ea5495cf0e08ff8f245430c3c3bc44025af43aaf9ecd12fcd6afc6c')
+b2sums=('02907f08cc504d0fbf703179b333b301c7ad8fc8535d85305faa7962dd7faa164f4492286902cb48eaf3db2a1445b541b1261c18a89ca8a73e80016af9581e26'
         'SKIP'
         '0969a3c477b6a3f34b44e067e515d7f306414dd14e0163584417b9d071e3cc825898219f7ff66ead7905b15429b8411304052d3b2b14a72e560bfabf9bf0adcf'
         '4ab6e415284c77802a39d0913d701fe55e56f3c22b19557661fbef77e456b5e1d151da4202695282b956602e716a7afdb994aa2fc17368b9a0d0d051d47a3afb'
-        'd7b587c25dd5830c27af475a8fdd8102139d7c8fdd6f04fe23b36be030e4411582e289f575c299255ff8183096f7d47247327276f9a24641cbd032d9675b837a')
+        'd7b587c25dd5830c27af475a8fdd8102139d7c8fdd6f04fe23b36be030e4411582e289f575c299255ff8183096f7d47247327276f9a24641cbd032d9675b837a'
+        '753664445d7d5cc0b36f51ac66549beea403b9731cbcb81b0a782974a0a73d90559ba93e6afcaa470b6f2f5a844c09ef695bdf3b1e6dfee97aa080f41b7fe513')
 validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512') # Max Kellermann <max@blarg.de>
 
-
-prepare() {
-  cd "${_pkgname}-${pkgver}"
-  sed -e '/\[Service\]/a User=mpd' \
-      -i "systemd/system/mpd.service.in"
-}
-
 build() {
-  cd "${_pkgname}-${pkgver}"
+  local _meson_options=(
+    -D smbclient=enabled
+    -D documentation=enabled
+    -D adplug=disabled
+    -D sndio=disabled
+    -D shine=disabled
+    -D tremor=disabled
+    -D b_ndebug=true
+  )
+
   # NOTE: sndio conflicts with alsa
   # TODO: package adplug
   # TODO: package shine
-  meson --prefix /usr \
-        --libexecdir lib \
-        --sbindir bin \
-        --buildtype plain \
-        --auto-features enabled \
-        --wrap-mode nodownload \
-        -D b_lto=true \
-        -D b_pie=true \
-        -D documentation=enabled \
-        -D adplug=disabled \
-        -D sndio=disabled \
-        -D shine=disabled \
-        -D tremor=disabled \
-        -D smbclient=enabled \
-        build
+  arch-meson "${_meson_options[@]}" build ${_pkgname}-$pkgver
   ninja -C build
 }
 
 check() {
-  cd "${_pkgname}-${pkgver}"
   ninja -C build test
 }
 
 package() {
-  depends+=('libbz2.so' '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' 'libexpat.so'
-  'libfaad.so' 'libfluidsynth.so' 'libfmt.so' 'libicui18n.so' 'libicuuc.so'
-  'libid3tag.so' 'libjack.so' 'libmikmod.so' 'libmpdclient.so' 'libmpg123.so'
-  'libogg.so' 'libopenmpt.so' 'libpipewire-0.3.so' 'libpulse.so'
-  'libsamplerate.so' 'libsndfile.so' 'libsystemd.so' 'libtwolame.so'
-  'libupnp.so' 'liburing.so' 'libvorbis.so' 'libvorbisenc.so' 'libyajl.so'
-  'libavfilter.so' 'libchromaprint.so' 'libixml.so')
-  cd "${_pkgname}-${pkgver}"
-  DESTDIR="${pkgdir}" ninja -C build install
-  install -vDm 644 "doc/${_pkgname}conf.example" \
-    -t "${pkgdir}/usr/share/doc/${_pkgname}/"
-  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"
+  depends+=(
+    alsa-lib libasound.so
+    audiofile libaudiofile.so
+    avahi libavahi-{client,common}.so
+    bzip2 libbz2.so
+    chromaprint libchromaprint.so
+    curl libcurl.so
+    dbus libdbus-1.so
+    expat libexpat.so
+    faad2 libfaad.so
+    ffmpeg libav{codec,filter,format,util}.so
+    flac libFLAC.so
+    fluidsynth libfluidsynth.so
+    fmt libfmt.so 
+    icu libicui18n.so libicuuc.so
+    jack libjack.so
+    lame libmp3lame.so
+    libao libao.so
+    libid3tag libid3tag.so
+    libmikmod libmikmod.so
+    libmpdclient libmpdclient.so
+    libogg libogg.so
+    libopenmpt libopenmpt.so
+    libpipewire libpipewire-0.3.so
+    libpulse libpulse.so
+    libsamplerate libsamplerate.so
+    libsndfile libsndfile.so
+    libupnp libixml.so libupnp.so
+    liburing liburing.so
+    libvorbis libvorbis{,enc}.so
+    mpg123 libmpg123.so
+    openal libopenal.so
+    opus libopus.so
+    sqlite libsqlite3.so
+    systemd-libs libsystemd.so
+    twolame libtwolame.so
+    yajl libyajl.so
+  )
+
+  DESTDIR="$pkgdir" ninja -C build install
+  install -vDm 644 ${_pkgname}-$pkgver/doc/${_pkgname}conf.example -t "$pkgdir/usr/share/doc/${_pkgname}/"
+  install -vDm 644 ${_pkgname}.service.override "$pkgdir/usr/lib/systemd/system/mpd.service.d/00-arch.conf"
+  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"
 }
diff --git a/mpd.service.override b/mpd.service.override
new file mode 100644
index 000000000000..d38c0594680c
--- /dev/null
+++ b/mpd.service.override
@@ -0,0 +1,2 @@
+[Service]
+User=mpd