From c10f307092a01257ee663c1ee95fcca4ec021052 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 20 Nov 2014 20:07:31 +0000
Subject: mpd: update to 19.4. closes #980

---
 abs/extra/mpd/PKGBUILD | 39 +++++++++++++++++++++------------------
 abs/extra/mpd/conf     |  6 ++++++
 2 files changed, 27 insertions(+), 18 deletions(-)
 create mode 100644 abs/extra/mpd/conf

diff --git a/abs/extra/mpd/PKGBUILD b/abs/extra/mpd/PKGBUILD
index 4f36986..c1803a4 100644
--- a/abs/extra/mpd/PKGBUILD
+++ b/abs/extra/mpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182602 2013-04-10 23:39:58Z bisson $
+# $Id$
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,19 +6,22 @@
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=mpd
-pkgver=0.17.4
+pkgver=0.19.4
 pkgrel=1
 pkgdesc='Flexible, powerful, server-side application for playing music'
 url='http://www.musicpd.org/'
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
-         'sqlite'  'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl' 'libsoup')
-makedepends=('doxygen')
-source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
-        'tmpfiles.d')
-sha1sums=('f60b54e368fe74fde2fd4571227b0428fe0ae3cb'
-          'f4d5922abb69abb739542d8e93f4dfd748acdad7')
+         'sqlite' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl' 'libmpdclient'
+         'icu' 'libupnp' 'libnfs')
+makedepends=('boost' 'doxygen')
+source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig}
+        'tmpfiles.d'
+        'conf')
+sha1sums=('f0397d7e923cd11fef8dae238efe9ae9ff12120f' 'SKIP'
+          'f4d5922abb69abb739542d8e93f4dfd748acdad7'
+          '291fd5cda9f0845834a553017327c4586bd853f6')
 
 backup=('etc/mpd.conf')
 install=install
@@ -28,8 +31,11 @@ build() {
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
-		--enable-lastfm \
+		--enable-libmpdclient \
+		--disable-jack \
 		--enable-soundcloud \
+		--enable-pipe-output \
+		--disable-pulse \
 		--disable-sidplay \
 		--with-systemdsystemunitdir=/usr/lib/systemd/system
 	make
@@ -38,14 +44,11 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-	install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists
-	install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf
+	install -Dm644 ../conf "${pkgdir}"/etc/mpd.conf
 	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf
-	sed \
-		-e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \
-		-e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \
-		-e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \
-		-e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \
-		-e '/^#user/c user "mpd"' \
-		-i "${pkgdir}"/etc/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
 }
diff --git a/abs/extra/mpd/conf b/abs/extra/mpd/conf
new file mode 100644
index 0000000..da7d6fa
--- /dev/null
+++ b/abs/extra/mpd/conf
@@ -0,0 +1,6 @@
+# See: /usr/share/doc/mpd/mpdconf.example
+
+pid_file "/run/mpd/mpd.pid"
+db_file "/var/lib/mpd/mpd.db"
+state_file "/var/lib/mpd/mpdstate"
+playlist_directory "/var/lib/mpd/playlists"
-- 
cgit v0.12

