From 78fa5418674553c910bb89dc2a2f21a717adfcca Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Thu, 10 Jan 2019 13:56:18 -0200
Subject: [PATCH] mpd: make use of mkdirs= and set audio group

---
 srcpkgs/mpd/files/mpd/run |  2 --
 srcpkgs/mpd/template      | 19 ++++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/mpd/files/mpd/run b/srcpkgs/mpd/files/mpd/run
index 9dade12f413..bde3c869b60 100755
--- a/srcpkgs/mpd/files/mpd/run
+++ b/srcpkgs/mpd/files/mpd/run
@@ -1,5 +1,3 @@
 #!/bin/sh
 install -d -m 0755 -o mpd -g mpd /run/mpd
-install -d -m 0755 /var/lib/mpd/playlists
-chown -R mpd:mpd /var/lib/mpd
 exec mpd --no-daemon
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index ddda7d58490..db69299f8c2 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,14 +1,14 @@
 # Template file for 'mpd'
 pkgname=mpd
 version=0.21.4
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dsidplay=enabled
- -Dbzip2=enabled -Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled
- -Dqobuz=disabled -Dchromaprint=enabled -Dsoxr=enabled -Dshout=disabled
- -Dadplug=disabled -Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled
- -Dsidplay=disabled -Dshine=disabled -Ddocumentation=true -Daudiofile=enabled
+ -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
+ -Dchromaprint=disabled -Dsoxr=enabled -Dshout=disabled -Dadplug=disabled
+ -Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
+ -Dshine=disabled -Ddocumentation=true -Daudiofile=enabled
  -Djack=$(vopt_if jack enabled disabled) -Dlame=$(vopt_if lame enabled disabled)
  -Dao=$(vopt_if ao enabled disabled) -Dmpcdec=$(vopt_if mpcdec enabled disabled)
  -Dsndio=$(vopt_if sndio enabled disabled) -Dpulse=$(vopt_if pulseaudio enabled disabled)
@@ -20,7 +20,7 @@ makedepends="avahi-glib-libs-devel boost-devel faad2-devel ffmpeg-devel
  libcurl-devel libid3tag-devel libmad-devel libmikmod-devel libmms-devel
  libmodplug-devel libmpdclient-devel libnfs-devel libsamplerate-devel
  libsoup-devel libupnp1.8-devel mpg123-devel opus-devel yajl-devel
- zziplib-devel chromaprint-devel libsoxr-devel audiofile-devel
+ zziplib-devel libsoxr-devel audiofile-devel
  twolame-devel $(vopt_if cdio 'libcdio-paranoia-devel')
  $(vopt_if jack 'jack-devel') $(vopt_if lame 'lame-devel')
  $(vopt_if libao 'libao-devel') $(vopt_if mpcdec 'libmpcdec-devel')
@@ -37,6 +37,11 @@ checksum=247112eabf1b818a4052db7f0f5917ab00831ebc60a1ec3bf1154da4dc16a5c7
 
 system_accounts="mpd"
 mpd_homedir="/var/lib/mpd"
+mpd_groups="audio"
+
+make_dirs="
+ /var/lib/mpd 0755 mpd mpd
+ /var/lib/mpd/playlists 0755 mpd mpd"
 
 # Package build options
 build_options="jack lame mpcdec pulseaudio libao wavpack sndio cdio openal"