add further dependencies and changes from extra

5 files changed, 158 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b120464a21b5..6cb51806be21 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,59 +1,133 @@
 pkgbase = mpd-git
 	pkgdesc = Flexible, powerful, server-side application for playing music (from git)
-	pkgver = 0.21.23.r976.geeec0ee80
+	pkgver = 0.21.25.r1114.ge8380cf2a
 	pkgrel = 1
 	url = https://www.musicpd.org/
 	arch = x86_64
-	license = GPL
+	license = GPL2
+	makedepends = alsa-lib
+	makedepends = audiofile
+	makedepends = avahi
 	makedepends = boost
-	makedepends = meson
+	makedepends = curl
+	makedepends = dbus
+	makedepends = faad2
+	makedepends = ffmpeg
+	makedepends = flac
+	makedepends = fluidsynth
+	makedepends = git
+	makedepends = icu
+	makedepends = jack
+	makedepends = libao
+	makedepends = libid3tag
+	makedepends = libmikmod
+	makedepends = libmpdclient
+	makedepends = libogg
+	makedepends = libpulse
+	makedepends = libsamplerate
+	makedepends = libsndfile
 	makedepends = liburing
+	makedepends = libvorbis
+	makedepends = meson
+	makedepends = mpg123
 	makedepends = python-sphinx
-	depends = audiofile
-	depends = avahi
-	depends = curl
-	depends = faad2
-	depends = ffmpeg
-	depends = fluidsynth
-	depends = icu
-	depends = jack
-	depends = libao
+	makedepends = systemd-libs
+	makedepends = twolame
+	depends = bzip2
+	depends = chromaprint
+	depends = expat
+	depends = gcc-libs
+	depends = glibc
+	depends = lame
+	depends = libcdio
 	depends = libcdio-paranoia
+	depends = libgcrypt
 	depends = libgme
-	depends = libid3tag
 	depends = libmad
-	depends = libmikmod
 	depends = libmms
 	depends = libmodplug
 	depends = libmpcdec
-	depends = libmpdclient
 	depends = libnfs
-	depends = libsamplerate
 	depends = libshout
+	depends = libsidplayfp
 	depends = libsoxr
-	depends = libvorbis
-	depends = systemd-libs
-	depends = libupnp
-	depends = mpg123
+	depends = libupnp-git
 	depends = openal
+	depends = opus
 	depends = smbclient
 	depends = sqlite
-	depends = twolame
 	depends = wavpack
 	depends = wildmidi
 	depends = yajl
+	depends = zlib
 	depends = zziplib
 	provides = mpd
 	conflicts = mpd
 	backup = etc/mpd.conf
 	source = mpd::git+https://github.com/MusicPlayerDaemon/MPD
-	source = tmpfiles.d
-	source = sysusers.d
-	source = conf
+	source = mpd.conf
+	source = mpd.sysusers
+	source = mpd.tmpfiles
 	sha256sums = SKIP
-	sha256sums = 2faa85c12449a5b3ca422ff1c1fa06d057c7e262a74bfa6298c914a92d6f2e7a
-	sha256sums = 0b74c6e5db08daab3091dc15a6b0c75210ba2f9e98fa074f6cfd605a461056b6
 	sha256sums = f40f68205834ca53cea3372e930bfe6c2f9ecc9df3b1605df2fec63a658b2e03
+	sha256sums = 0b74c6e5db08daab3091dc15a6b0c75210ba2f9e98fa074f6cfd605a461056b6
+	sha256sums = 2faa85c12449a5b3ca422ff1c1fa06d057c7e262a74bfa6298c914a92d6f2e7a
 
 pkgname = mpd-git
+	depends = bzip2
+	depends = chromaprint
+	depends = expat
+	depends = gcc-libs
+	depends = glibc
+	depends = lame
+	depends = libcdio
+	depends = libcdio-paranoia
+	depends = libgcrypt
+	depends = libgme
+	depends = libmad
+	depends = libmms
+	depends = libmodplug
+	depends = libmpcdec
+	depends = libnfs
+	depends = libshout
+	depends = libsidplayfp
+	depends = libsoxr
+	depends = libupnp-git
+	depends = openal
+	depends = opus
+	depends = smbclient
+	depends = sqlite
+	depends = wavpack
+	depends = wildmidi
+	depends = yajl
+	depends = zlib
+	depends = zziplib
+	depends = libFLAC.so
+	depends = libao.so
+	depends = libasound.so
+	depends = libaudiofile.so
+	depends = libavahi-client.so
+	depends = libavahi-common.so
+	depends = libavcodec.so
+	depends = libavformat.so
+	depends = libavutil.so
+	depends = libcurl.so
+	depends = libdbus-1.so
+	depends = libfaad.so
+	depends = libfluidsynth.so
+	depends = libicui18n.so
+	depends = libicuuc.so
+	depends = libid3tag.so
+	depends = libjack.so
+	depends = libmikmod.so
+	depends = libmpdclient.so
+	depends = libmpg123.so
+	depends = libogg.so
+	depends = libpulse.so
+	depends = libsamplerate.so
+	depends = libsndfile.so
+	depends = libsystemd.so
+	depends = libtwolame.so
+	depends = libvorbis.so
+	depends = libvorbisenc.so
 
diff --git a/PKGBUILD b/PKGBUILD
index 3e0ee2ddb252..3c6b81e4a90f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Amanoel Dawod <amoka at amanoel dot com>
+# Contributor: David Runge <dvzrv@archlinux.org>
 # Contributor: E5ten <e5ten.arch@gmail.com>
 # Contributor: anna <morganamilo@gmail.com>
 # Contributor: sudokode <sudokode@gmail.com>
@@ -12,71 +13,87 @@
 
 pkgname=mpd-git
 _pkgname=mpd
-pkgver=0.21.23.r976.geeec0ee80
+pkgver=0.21.25.r1114.ge8380cf2a
 pkgrel=1
 pkgdesc='Flexible, powerful, server-side application for playing music (from git)'
 url='https://www.musicpd.org/'
-license=('GPL')
+license=('GPL2')
 arch=('x86_64')
-depends=('audiofile' 'avahi' 'curl' 'faad2' 'ffmpeg' 'fluidsynth'
-	 'icu' 'jack' 'libao' 'libcdio-paranoia' 'libgme' 'libid3tag' 'libmad'
-	 'libmikmod' 'libmms' 'libmodplug' 'libmpcdec' 'libmpdclient' 'libnfs'
-	 'libsamplerate' 'libshout' 'libsoxr' 'libvorbis' 'systemd-libs'
-	 'libupnp' 'mpg123' 'openal' 'smbclient' 'sqlite' 'twolame' 'wavpack'
-	 'wildmidi' 'yajl' 'zziplib')
-makedepends=('boost' 'meson' 'liburing' 'python-sphinx')
+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')
+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')
 provides=('mpd')
 conflicts=('mpd')
 source=("$_pkgname::git+https://github.com/MusicPlayerDaemon/MPD"
-        'tmpfiles.d'
-        'sysusers.d'
-        'conf')
+        "${_pkgname}.conf"
+        "${_pkgname}.sysusers"
+        "${_pkgname}.tmpfiles")
 sha256sums=('SKIP'
-            '2faa85c12449a5b3ca422ff1c1fa06d057c7e262a74bfa6298c914a92d6f2e7a'
+            'f40f68205834ca53cea3372e930bfe6c2f9ecc9df3b1605df2fec63a658b2e03'
             '0b74c6e5db08daab3091dc15a6b0c75210ba2f9e98fa074f6cfd605a461056b6'
-            'f40f68205834ca53cea3372e930bfe6c2f9ecc9df3b1605df2fec63a658b2e03')
+            '2faa85c12449a5b3ca422ff1c1fa06d057c7e262a74bfa6298c914a92d6f2e7a')
 
 backup=('etc/mpd.conf')
 
 pkgver() {
 	cd "${_pkgname}"
-
 	git describe --long | sed 's/^v//; s/\([^-]*-g\)/r\1/; s/-/./g'
 }
 
 prepare() {
 	cd "${_pkgname}"
-	rm -fr build
-	install -d build
+	sed -e '/\[Service\]/a User=mpd' \
+		-i "systemd/system/mpd.service.in"
 }
 
 build() {
-	cd "${_pkgname}/build"
-	_opts=('-Ddocumentation=true'
-	       '-Dchromaprint=disabled' # appears not to be used for anything
-	       '-Dsidplay=disabled' # unclear why but disabled in the past
-	       '-Dadplug=disabled' # not in an official repo
-	       '-Dsndio=disabled' # interferes with detection of alsa devices
-	       '-Dshine=disabled' # not in an official repo
-	       '-Dtremor=disabled' # not in an official repo
-	)
-	arch-meson .. ${_opts[@]}
-	ninja
+  cd "${_pkgname}"
+  # 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 \
+        build
+  ninja -C build
 }
 
-package() {
-	cd "${_pkgname}/build"
-	DESTDIR="${pkgdir}" ninja 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
+check() {
+  cd "${_pkgname}"
+  ninja -C build test
+}
 
-	install -Dm644 ../../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf
-	install -Dm644 ../../sysusers.d "${pkgdir}"/usr/lib/sysusers.d/mpd.conf
-	install -Dm644 ../../conf "${pkgdir}"/etc/mpd.conf
+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')
+  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/"
+  install -vDm 644 "doc/${_pkgname}.1.rst" -t "${pkgdir}/usr/share/man/man1/"
 
-	sed \
-		-e '/\[Service\]/a User=mpd' \
-		-e '/WantedBy=/c WantedBy=default.target' \
-		-i "${pkgdir}"/usr/lib/systemd/system/mpd.service
+  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/conf b/mpd.conf
index da7d6fae92eb..da7d6fae92eb 100644
--- a/conf
+++ b/mpd.conf
diff --git a/sysusers.d b/mpd.sysusers
index 58d47478ea69..58d47478ea69 100644
--- a/sysusers.d
+++ b/mpd.sysusers
diff --git a/tmpfiles.d b/mpd.tmpfiles
index bef72182b228..bef72182b228 100644
--- a/tmpfiles.d
+++ b/mpd.tmpfiles