update upstream, sync with main arch pkgbuild etc

1 files changed, 10 insertions, 19 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1ca40d5593de..4615313fdb2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,22 @@
 # Maintainer: Melvin Vermeeren <mail@mel.vin>
 
 pkgname=mpd-sacd
-pkgver=0.20
-pkgrel=8
+pkgver=0.20.4
+pkgrel=1
 pkgdesc='MPD with patches for SACD and DVDA ISO playback.'
 url='http://git.musicpd.org/cgit/manisiutkin/mpd.git/'
 license=('GPL')
 arch=('i686' 'x86_64' 'aarch64' 'armv7h')
 depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
-         'sqlite' 'jack' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl' 'libmpdclient'
-         'icu' 'libupnp' 'libnfs' 'libsamplerate' 'libsoxr' 'smbclient' 'libcdio-paranoia')
+	'sqlite' 'jack' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl' 'libmpdclient'
+	'icu' 'libupnp' 'libnfs' 'libsamplerate' 'libsoxr' 'smbclient' 'libcdio-paranoia'
+	'libgme')
 makedepends=('boost' 'doxygen')
 conflicts=('mpd')
-provides=('mpd=0.20')
-source=('git://git.musicpd.org/manisiutkin/mpd.git#commit=093f880674826dab55c5063128813f543d8c063b'
-        'tmpfiles.d'
-        'conf')
+provides=("mpd=${pkgver}")
+source=('git://git.musicpd.org/manisiutkin/mpd.git#commit=6be0d35cd291781163fcef036def5c3a10ccc7f0'
+	'tmpfiles.d'
+	'conf')
 sha1sums=('SKIP'
           'f4d5922abb69abb739542d8e93f4dfd748acdad7'
           '291fd5cda9f0845834a553017327c4586bd853f6')
@@ -23,12 +24,6 @@ sha1sums=('SKIP'
 backup=('etc/mpd.conf')
 install=install
 
-prepare() {
-	# Temporary; see FS#48372
-	install -d "${srcdir}"/pkg-config
-	ln -s /usr/lib/pkgconfig/libsystemd.pc "${srcdir}"/pkg-config/libsystemd-daemon.pc
-}
-
 build() {
 	cd "${srcdir}/mpd"
 	./autogen.sh
@@ -44,12 +39,9 @@ build() {
 		--enable-sacdiso \
 		--enable-dvdaiso \
 		--disable-sidplay \
-		--disable-wildmidi \
+		--with-systemduserunitdir=/usr/lib/systemd/user \
 		--with-systemdsystemunitdir=/usr/lib/systemd/system
 
-	# Quick fix for missing glib-2.0 include.
-	sed -i 's/DSD_CFLAGS = \\/DSD_CFLAGS = $(MMS_CFLAGS) \\/' "${srcdir}"/mpd/Makefile
-
 	make
 }
 
@@ -60,7 +52,6 @@ package() {
 	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf
 	install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd{,/playlists}
 
-	install -Dm644 "${pkgdir}"/usr/lib/systemd/{system,user}/mpd.service
 	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,user}/mpd.service
 }