[arch-commits] Commit in mpd/repos (8 files)
Gaetan Bisson
bisson at archlinux.org
Fri Mar 23 16:56:11 UTC 2012
Date: Friday, March 23, 2012 @ 12:56:11
Author: bisson
Revision: 154124
db-move: moved mpd from [testing] to [extra] (x86_64)
Added:
mpd/repos/extra-x86_64/PKGBUILD
(from rev 154122, mpd/repos/testing-x86_64/PKGBUILD)
mpd/repos/extra-x86_64/install
(from rev 154122, mpd/repos/testing-x86_64/install)
mpd/repos/extra-x86_64/rc.d
(from rev 154122, mpd/repos/testing-x86_64/rc.d)
Deleted:
mpd/repos/extra-x86_64/ChangeLog
mpd/repos/extra-x86_64/PKGBUILD
mpd/repos/extra-x86_64/mpd
mpd/repos/extra-x86_64/mpd.install
mpd/repos/testing-x86_64/
-------------+
ChangeLog | 15 -------
PKGBUILD | 122 +++++++++++++++++++++++++++++-----------------------------
install | 10 ++++
mpd | 36 -----------------
mpd.install | 18 --------
rc.d | 27 ++++++++++++
6 files changed, 98 insertions(+), 130 deletions(-)
Deleted: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog 2012-03-23 16:56:09 UTC (rev 154123)
+++ extra-x86_64/ChangeLog 2012-03-23 16:56:11 UTC (rev 154124)
@@ -1,15 +0,0 @@
-2012-02-11 Angel Velasquez <angvp at archlinux.org>
- * Version bump to 0.16.7
-
-2011-12-05 Angel Velasquez <angvp at archlinux.org>
- * Version bump to 0.16.6
-
-2011-09-03 Angel Velasquez <angvp at archlinux.org>
- * Version bump to 0.16.4
- * Removed the patch mpd-0.16.3_ffmpeg_sigsegv.patch since is included upstream
-
-2011-06-25 Angel Velasquez <angvp at archlinux.org>
- * Added a patch for bug with ffmpeg FS#24839
-
-
-# vim: set ft=changelog ts=4 sw=4 et:
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-03-23 16:56:09 UTC (rev 154123)
+++ extra-x86_64/PKGBUILD 2012-03-23 16:56:11 UTC (rev 154124)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
-# Contributor: Ben <ben at benmazer.net>
-
-pkgname=mpd
-pkgver=0.16.7
-pkgrel=1
-pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://mpd.wikia.com/wiki/Server"
-depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
- 'sqlite3' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag'
- 'libpulse')
-makedepends=('pkgconfig' 'doxygen')
-install=${pkgname}.install
-changelog=ChangeLog
-source=("http://downloads.sourceforge.net/musicpd/$pkgname-$pkgver.tar.bz2"
-'mpd')
-md5sums=('3d0e7c36646e80386b32966bd4268e8d'
- 'e5669c2bff4031928531e52475addeb1')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --enable-lastfm \
- --enable-jack \
- --enable-pulse \
- --enable-documentation \
- --disable-libwrap \
- --disable-cue \
- --disable-sidplay \
- --with-systemdsystemunitdir=/lib/systemd/system
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
- # set our dirs in mpd.conf file
- sed -i 's|^music_directory.*$|#music_directory "path_to_your_music_collection"|1' doc/mpdconf.example
- sed -i 's|playlist_directory.*$|playlist_directory "/var/lib/mpd/playlists"|1' doc/mpdconf.example
- sed -i 's|db_file.*$|db_file "/var/lib/mpd/mpd.db"|1' doc/mpdconf.example
- sed -i 's|log_file.*$|log_file "/var/log/mpd/mpd.log"|1' doc/mpdconf.example
- sed -i 's|error_file.*$|error_file "/var/log/mpd/mpd.error"|1' doc/mpdconf.example
- sed -i 's|#pid_file.*$|pid_file "/var/run/mpd/mpd.pid"|1' doc/mpdconf.example
- sed -i 's|#state_file.*$|state_file "/var/lib/mpd/mpdstate"|1' doc/mpdconf.example
- sed -i 's|#user.*$|user "mpd"|1' doc/mpdconf.example
-
- install -Dm644 "doc/mpdconf.example" "$pkgdir/usr/share/mpd/mpd.conf.example"
-
- install -Dm755 "$srcdir/mpd" "$pkgdir/etc/rc.d/mpd"
- install -d "$pkgdir"/var/{lib/mpd/playlists,log/mpd}
-}
Copied: mpd/repos/extra-x86_64/PKGBUILD (from rev 154122, mpd/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-03-23 16:56:11 UTC (rev 154124)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
+# Contributor: Ben <ben at benmazer.net>
+
+pkgname=mpd
+pkgver=0.16.7
+pkgrel=3
+pkgdesc='Flexible, powerful, server-side application for playing music'
+url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki'
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
+ 'sqlite3' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag'
+ 'libpulse')
+makedepends=('doxygen')
+source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
+ 'rc.d')
+sha1sums=('878f3ce82d4f00f6cbad63a625b2c0274c4a704a'
+ '3777bdb4fff4b7911be3b1242aabae9d2912ef18')
+
+install=install
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-lastfm \
+ --enable-jack \
+ --enable-pulse \
+ --enable-documentation \
+ --disable-libwrap \
+ --disable-cue \
+ --disable-sidplay \
+ --disable-documentation \
+ --with-systemdsystemunitdir=/lib/systemd/system
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ 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 doc/mpdconf.example
+
+ install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/mpd
+ install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists
+ install -Dm644 doc/mpdconf.example "${pkgdir}"/usr/share/mpd/mpd.conf.example
+}
Copied: mpd/repos/extra-x86_64/install (from rev 154122, mpd/repos/testing-x86_64/install)
===================================================================
--- extra-x86_64/install (rev 0)
+++ extra-x86_64/install 2012-03-23 16:56:11 UTC (rev 154124)
@@ -0,0 +1,10 @@
+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/true -G audio mpd >/dev/null
+ echo '==> Now create a /etc/mpd.conf file; see: /usr/share/mpd/mpd.conf.example'
+}
+
+post_remove() {
+ getent passwd mpd &>/dev/null && userdel mpd >/dev/null
+ getent group mpd &>/dev/null && groupdel mpd >/dev/null
+}
Deleted: extra-x86_64/mpd
===================================================================
--- extra-x86_64/mpd 2012-03-23 16:56:09 UTC (rev 154123)
+++ extra-x86_64/mpd 2012-03-23 16:56:11 UTC (rev 154124)
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Starting Music Player Daemon"
- [ ! -d /var/run/mpd ] && install -d -g 45 -o 45 /var/run/mpd
- /usr/bin/mpd /etc/mpd.conf &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon mpd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Music Player Daemon"
- /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon mpd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Deleted: extra-x86_64/mpd.install
===================================================================
--- extra-x86_64/mpd.install 2012-03-23 16:56:09 UTC (rev 154123)
+++ extra-x86_64/mpd.install 2012-03-23 16:56:11 UTC (rev 154124)
@@ -1,18 +0,0 @@
-post_install() {
- post_upgrade
- echo "==> Create a configuration file /etc/mpd.conf before using MPD (example: /usr/share/mpd/mpd.conf.example)"
-}
-
-post_upgrade() {
- getent group "mpd" &>/dev/null || groupadd -r -g 45 mpd 1>/dev/null
- getent passwd "mpd" &>/dev/null || useradd -r -u 45 -g mpd -d "/var/lib/mpd" -s "/bin/true" -G "audio" mpd 1>/dev/null
- for dir in /var/{lib,log}/mpd; do
- chown -R mpd:mpd "$dir" 1>/dev/null
- done
-}
-
-post_remove() {
- getent passwd "mpd" &>/dev/null && userdel mpd 1>/dev/null
- getent group "mpd" &>/dev/null && groupdel mpd 1>/dev/null
- [ -f etc/mpd.conf ] && mv etc/mpd.conf etc/mpd.conf.pacsave 1>/dev/null
-}
Copied: mpd/repos/extra-x86_64/rc.d (from rev 154122, mpd/repos/testing-x86_64/rc.d)
===================================================================
--- extra-x86_64/rc.d (rev 0)
+++ extra-x86_64/rc.d 2012-03-23 16:56:11 UTC (rev 154124)
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+[[ -d /run/mpd ]] || install -d -g mpd -o mpd /run/mpd
+
+case "$1" in
+ start)
+ stat_busy 'Starting Music Player Daemon'
+ /usr/bin/mpd /etc/mpd.conf &> /dev/null &&
+ { add_daemon mpd; stat_done; } || stat_fail
+ ;;
+ stop)
+ stat_busy 'Stopping Music Player Daemon'
+ /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null &&
+ { rm_daemon mpd; stat_done; } || stat_fail
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
More information about the arch-commits
mailing list