summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD23
-rw-r--r--mpd.conf6
-rw-r--r--mpd.install11
-rw-r--r--mpd.tmpfile1
5 files changed, 12 insertions, 47 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 21f1ae4a96ca..b791538ab8fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,8 @@
-# Generated by mksrcinfo v8
-# Wed Apr 27 13:08:06 UTC 2016
pkgbase = mpd
- pkgdesc = Flexible, powerful, server-side application for playing music. Minimal version with only flac playback through socket connection.
- pkgver = 0.19.14
+ pkgdesc = Flexible, powerful, server-side application for playing music. Minimal version with only flac playback through socket connection as user, but configurable.
+ pkgver = 0.19.19
pkgrel = 1
url = http://www.musicpd.org/
- install = mpd.install
arch = i686
arch = x86_64
arch = armv7h
@@ -17,15 +14,14 @@ pkgbase = mpd
depends = icu
depends = libmpdclient
depends = sqlite
- provides = mpd=0.19.14
+ provides = mpd=0.19.19
conflicts = mpd
replaces = mpd
- source = http://www.musicpd.org/download/mpd/0.19/mpd-0.19.14.tar.xz
- source = http://www.musicpd.org/download/mpd/0.19/mpd-0.19.14.tar.xz.sig
- source = mpd.tmpfile
- sha1sums = 2faf8664ae5c9183e73185c9dcfe0be50579f5e8
+ source = http://www.musicpd.org/download/mpd/0.19/mpd-0.19.19.tar.xz
+ source = http://www.musicpd.org/download/mpd/0.19/mpd-0.19.19.tar.xz.sig
+ validpgpkeys = 0392335A78083894A4301C43236E8A58C6DB4512
+ sha1sums = 8c281b823825cab6677cb142b564acbf09a2874d
sha1sums = SKIP
- sha1sums = f4d5922abb69abb739542d8e93f4dfd748acdad7
pkgname = mpd-minimal
diff --git a/PKGBUILD b/PKGBUILD
index 031098fbec6e..8363f011e2ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
pkgbase=mpd
pkgname=mpd-minimal
-pkgver=0.19.14
+pkgver=0.19.19
pkgrel=1
-pkgdesc='Flexible, powerful, server-side application for playing music. Minimal version with only flac playback through socket connection.'
+pkgdesc='Flexible, powerful, server-side application for playing music. Minimal version with only flac playback through socket connection as user, but configurable.'
url='http://www.musicpd.org/'
license=('GPL')
arch=('i686' 'x86_64' 'armv7h')
@@ -14,14 +14,8 @@ provides=("mpd=$pkgver")
conflicts=('mpd')
replaces=('mpd')
validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512')
-source=("http://www.musicpd.org/download/mpd/${pkgver%.*}/mpd-${pkgver}.tar.xz"{,.sig}
- 'mpd.tmpfile')
-# 'mpd.conf')
-sha1sums=('2faf8664ae5c9183e73185c9dcfe0be50579f5e8' 'SKIP'
- 'f4d5922abb69abb739542d8e93f4dfd748acdad7')
-# '291fd5cda9f0845834a553017327c4586bd853f6')
-#backup=('etc/mpd.conf')
-install=mpd.install
+source=("http://www.musicpd.org/download/mpd/${pkgver%.*}/mpd-${pkgver}.tar.xz"{,.sig})
+sha1sums=('8c281b823825cab6677cb142b564acbf09a2874d' 'SKIP')
build() {
cd "${srcdir}/mpd-${pkgver}"
@@ -43,6 +37,7 @@ build() {
--disable-adplug \
--disable-audiofile \
--disable-ffmpeg \
+ --enable-flac \
--disable-fluidsynth \
--disable-gme \
--disable-mad \
@@ -93,12 +88,4 @@ package_mpd-minimal() {
cd "${srcdir}/mpd-${pkgver}"
make DESTDIR="${pkgdir}" install
-
-# install -Dm644 ../mpd.conf "${pkgdir}"/etc/mpd.conf
- install -Dm644 ../mpd.tmpfile "${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
}
diff --git a/mpd.conf b/mpd.conf
deleted file mode 100644
index da7d6fae92eb..000000000000
--- a/mpd.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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"
diff --git a/mpd.install b/mpd.install
deleted file mode 100644
index 12742b90aa4d..000000000000
--- a/mpd.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- getent group mpd &>/dev/null || groupadd -r -g 45 mpd >/dev/null
- getent passwd mpd &>/dev/null || useradd -r -u 45 -g mpd -d /var/lib/mpd -s /bin/false -G audio mpd >/dev/null
- usr/bin/systemd-tmpfiles --create mpd.conf || true
-}
-
-post_remove() {
- getent passwd mpd &>/dev/null && userdel mpd >/dev/null
- getent group mpd &>/dev/null && groupdel mpd >/dev/null
- true
-}
diff --git a/mpd.tmpfile b/mpd.tmpfile
deleted file mode 100644
index 41c4e743a3a1..000000000000
--- a/mpd.tmpfile
+++ /dev/null
@@ -1 +0,0 @@
-d /run/mpd 0755 mpd mpd