[arch-commits] Commit in mpd/repos (18 files)
Angel Velásquez
angvp at archlinux.org
Sun Sep 4 17:03:39 UTC 2011
Date: Sunday, September 4, 2011 @ 13:03:38
Author: angvp
Revision: 136986
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
mpd/repos/extra-i686/ChangeLog
(from rev 136985, mpd/trunk/ChangeLog)
mpd/repos/extra-i686/PKGBUILD
(from rev 136985, mpd/trunk/PKGBUILD)
mpd/repos/extra-i686/mpd
(from rev 136985, mpd/trunk/mpd)
mpd/repos/extra-i686/mpd.install
(from rev 136985, mpd/trunk/mpd.install)
mpd/repos/extra-x86_64/ChangeLog
(from rev 136985, mpd/trunk/ChangeLog)
mpd/repos/extra-x86_64/PKGBUILD
(from rev 136985, mpd/trunk/PKGBUILD)
mpd/repos/extra-x86_64/mpd
(from rev 136985, mpd/trunk/mpd)
mpd/repos/extra-x86_64/mpd.install
(from rev 136985, mpd/trunk/mpd.install)
Deleted:
mpd/repos/extra-i686/ChangeLog
mpd/repos/extra-i686/PKGBUILD
mpd/repos/extra-i686/mpd
mpd/repos/extra-i686/mpd-0.16.3_ffmpeg_sigsegv.patch
mpd/repos/extra-i686/mpd.install
mpd/repos/extra-x86_64/ChangeLog
mpd/repos/extra-x86_64/PKGBUILD
mpd/repos/extra-x86_64/mpd
mpd/repos/extra-x86_64/mpd-0.16.3_ffmpeg_sigsegv.patch
mpd/repos/extra-x86_64/mpd.install
----------------------------------------------+
extra-i686/ChangeLog | 14 +-
extra-i686/PKGBUILD | 117 ++++++++++++-------------
extra-i686/mpd | 72 +++++++--------
extra-i686/mpd-0.16.3_ffmpeg_sigsegv.patch | 21 ----
extra-i686/mpd.install | 36 +++----
extra-x86_64/ChangeLog | 14 +-
extra-x86_64/PKGBUILD | 117 ++++++++++++-------------
extra-x86_64/mpd | 72 +++++++--------
extra-x86_64/mpd-0.16.3_ffmpeg_sigsegv.patch | 21 ----
extra-x86_64/mpd.install | 36 +++----
10 files changed, 240 insertions(+), 280 deletions(-)
Deleted: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog 2011-09-04 17:02:27 UTC (rev 136985)
+++ extra-i686/ChangeLog 2011-09-04 17:03:38 UTC (rev 136986)
@@ -1,5 +0,0 @@
-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:
Copied: mpd/repos/extra-i686/ChangeLog (from rev 136985, mpd/trunk/ChangeLog)
===================================================================
--- extra-i686/ChangeLog (rev 0)
+++ extra-i686/ChangeLog 2011-09-04 17:03:38 UTC (rev 136986)
@@ -0,0 +1,9 @@
+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-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-09-04 17:02:27 UTC (rev 136985)
+++ extra-i686/PKGBUILD 2011-09-04 17:03:38 UTC (rev 136986)
@@ -1,60 +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.3
-pkgrel=2
-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'
- 'mpd-0.16.3_ffmpeg_sigsegv.patch')
-md5sums=('6e708c02b0e8c288aec855eecf441a5a'
- 'e5669c2bff4031928531e52475addeb1'
- '9a730957e213c62339e9335971e4b85e')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --enable-lastfm \
- --enable-jack \
- --enable-pulse \
- --enable-documentation \
- --disable-libwrap \
- --disable-cue \
- --disable-sidplay
- patch -Np1 -i $srcdir/mpd-0.16.3_ffmpeg_sigsegv.patch
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- # set ours 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-i686/PKGBUILD (from rev 136985, mpd/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-04 17:03:38 UTC (rev 136986)
@@ -0,0 +1,57 @@
+# $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.4
+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=('ddac46eb7d976c5cc6f9bac9e4e100f1'
+ '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
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ # set ours 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}
+}
Deleted: extra-i686/mpd
===================================================================
--- extra-i686/mpd 2011-09-04 17:02:27 UTC (rev 136985)
+++ extra-i686/mpd 2011-09-04 17:03:38 UTC (rev 136986)
@@ -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
Copied: mpd/repos/extra-i686/mpd (from rev 136985, mpd/trunk/mpd)
===================================================================
--- extra-i686/mpd (rev 0)
+++ extra-i686/mpd 2011-09-04 17:03:38 UTC (rev 136986)
@@ -0,0 +1,36 @@
+#!/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-i686/mpd-0.16.3_ffmpeg_sigsegv.patch
===================================================================
--- extra-i686/mpd-0.16.3_ffmpeg_sigsegv.patch 2011-09-04 17:02:27 UTC (rev 136985)
+++ extra-i686/mpd-0.16.3_ffmpeg_sigsegv.patch 2011-09-04 17:03:38 UTC (rev 136986)
@@ -1,21 +0,0 @@
-diff -ur mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c
---- mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c 2011-06-04 17:36:33.000000000 +0300
-+++ mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c 2011-06-24 18:18:51.840218251 +0300
-@@ -321,7 +321,7 @@
- }
-
- //ffmpeg works with ours "fileops" helper
-- AVFormatContext *format_context;
-+ AVFormatContext *format_context = NULL;
- if (av_open_input_stream(&format_context, stream->io, input->uri,
- input_format, NULL) != 0) {
- g_warning("Open failed\n");
-@@ -470,7 +470,7 @@
- if (stream == NULL)
- return NULL;
-
-- AVFormatContext *f;
-+ AVFormatContext *f = NULL;
- if (av_open_input_stream(&f, stream->io, is->uri,
- input_format, NULL) != 0) {
- mpd_ffmpeg_stream_close(stream);
Deleted: extra-i686/mpd.install
===================================================================
--- extra-i686/mpd.install 2011-09-04 17:02:27 UTC (rev 136985)
+++ extra-i686/mpd.install 2011-09-04 17:03:38 UTC (rev 136986)
@@ -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-i686/mpd.install (from rev 136985, mpd/trunk/mpd.install)
===================================================================
--- extra-i686/mpd.install (rev 0)
+++ extra-i686/mpd.install 2011-09-04 17:03:38 UTC (rev 136986)
@@ -0,0 +1,18 @@
+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
+}
Deleted: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog 2011-09-04 17:02:27 UTC (rev 136985)
+++ extra-x86_64/ChangeLog 2011-09-04 17:03:38 UTC (rev 136986)
@@ -1,5 +0,0 @@
-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:
Copied: mpd/repos/extra-x86_64/ChangeLog (from rev 136985, mpd/trunk/ChangeLog)
===================================================================
--- extra-x86_64/ChangeLog (rev 0)
+++ extra-x86_64/ChangeLog 2011-09-04 17:03:38 UTC (rev 136986)
@@ -0,0 +1,9 @@
+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 2011-09-04 17:02:27 UTC (rev 136985)
+++ extra-x86_64/PKGBUILD 2011-09-04 17:03:38 UTC (rev 136986)
@@ -1,60 +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.3
-pkgrel=2
-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'
- 'mpd-0.16.3_ffmpeg_sigsegv.patch')
-md5sums=('6e708c02b0e8c288aec855eecf441a5a'
- 'e5669c2bff4031928531e52475addeb1'
- '9a730957e213c62339e9335971e4b85e')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --enable-lastfm \
- --enable-jack \
- --enable-pulse \
- --enable-documentation \
- --disable-libwrap \
- --disable-cue \
- --disable-sidplay
- patch -Np1 -i $srcdir/mpd-0.16.3_ffmpeg_sigsegv.patch
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- # set ours 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 136985, mpd/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-09-04 17:03:38 UTC (rev 136986)
@@ -0,0 +1,57 @@
+# $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.4
+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=('ddac46eb7d976c5cc6f9bac9e4e100f1'
+ '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
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ # set ours 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}
+}
Deleted: extra-x86_64/mpd
===================================================================
--- extra-x86_64/mpd 2011-09-04 17:02:27 UTC (rev 136985)
+++ extra-x86_64/mpd 2011-09-04 17:03:38 UTC (rev 136986)
@@ -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
Copied: mpd/repos/extra-x86_64/mpd (from rev 136985, mpd/trunk/mpd)
===================================================================
--- extra-x86_64/mpd (rev 0)
+++ extra-x86_64/mpd 2011-09-04 17:03:38 UTC (rev 136986)
@@ -0,0 +1,36 @@
+#!/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-0.16.3_ffmpeg_sigsegv.patch
===================================================================
--- extra-x86_64/mpd-0.16.3_ffmpeg_sigsegv.patch 2011-09-04 17:02:27 UTC (rev 136985)
+++ extra-x86_64/mpd-0.16.3_ffmpeg_sigsegv.patch 2011-09-04 17:03:38 UTC (rev 136986)
@@ -1,21 +0,0 @@
-diff -ur mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c
---- mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c 2011-06-04 17:36:33.000000000 +0300
-+++ mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c 2011-06-24 18:18:51.840218251 +0300
-@@ -321,7 +321,7 @@
- }
-
- //ffmpeg works with ours "fileops" helper
-- AVFormatContext *format_context;
-+ AVFormatContext *format_context = NULL;
- if (av_open_input_stream(&format_context, stream->io, input->uri,
- input_format, NULL) != 0) {
- g_warning("Open failed\n");
-@@ -470,7 +470,7 @@
- if (stream == NULL)
- return NULL;
-
-- AVFormatContext *f;
-+ AVFormatContext *f = NULL;
- if (av_open_input_stream(&f, stream->io, is->uri,
- input_format, NULL) != 0) {
- mpd_ffmpeg_stream_close(stream);
Deleted: extra-x86_64/mpd.install
===================================================================
--- extra-x86_64/mpd.install 2011-09-04 17:02:27 UTC (rev 136985)
+++ extra-x86_64/mpd.install 2011-09-04 17:03:38 UTC (rev 136986)
@@ -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/mpd.install (from rev 136985, mpd/trunk/mpd.install)
===================================================================
--- extra-x86_64/mpd.install (rev 0)
+++ extra-x86_64/mpd.install 2011-09-04 17:03:38 UTC (rev 136986)
@@ -0,0 +1,18 @@
+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
+}
More information about the arch-commits
mailing list