diff options
| author | root <root@rshg047.dnsready.net> | 2011-07-22 23:13:01 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-07-22 23:13:01 +0000 |
| commit | b57c1def9a907b81a49aa91eeb39c9321763c276 (patch) | |
| tree | 1d056a9ceb1c5ab57a9344548d8ab2a273f09910 /community/xmms2 | |
| parent | 34b339c5913a55cb5bac8a502696fcd3f54aac0f (diff) | |
Fri Jul 22 23:13:01 UTC 2011
Diffstat (limited to 'community/xmms2')
| -rw-r--r-- | community/xmms2/PKGBUILD | 13 | ||||
| -rwxr-xr-x | community/xmms2/xmms2d.rc | 11 |
2 files changed, 11 insertions, 13 deletions
diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index 85d5ba1ae..e9fb57156 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 33390 2010-11-24 12:54:10Z spupykin $ +# $Id: PKGBUILD 52111 2011-07-20 09:27:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.7DrNo -pkgrel=8 +pkgrel=9 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64') url="http://xmms2.org/" @@ -50,27 +50,22 @@ source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 xmms2d.conf xmms2d.rc xmms2-helpers.patch - xmms2-ruby-1.9.patch vorbis-albumart.patch) md5sums=('60e50b591078acb6a85cd83de0f2b077' 'af13c937bf3c86b77ae6820107aab9b8' - '893371ba4dc7b428322e44329683211f' + '9d8e3e1a434f271423bdd228a1e9bd7c' 'eddb800ebcc495b8574044a110a34add' - '017eff634d755c98dd037cd41aecd652' 'c5a16da0c5a6ebe5e7f58afb6edfa87e') build() { cd ${srcdir}/${pkgname}-${pkgver} patch -Np1 < ${srcdir}/xmms2-helpers.patch -# patch -Np1 < ${srcdir}/xmms2-ruby-1.9.patch -# sed -i -e 's#avcodec.h#libavcodec/avcodec.h#' src/plugins/avcodec/avcodec.c + patch -p1 <$srcdir/vorbis-albumart.patch # python2 fix sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf - patch -p1 <$srcdir/vorbis-albumart.patch - ./waf configure --prefix=/usr \ --with-optionals=python,cli,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli ./waf build diff --git a/community/xmms2/xmms2d.rc b/community/xmms2/xmms2d.rc index af931ec0a..9d4d2b7e9 100755 --- a/community/xmms2/xmms2d.rc +++ b/community/xmms2/xmms2d.rc @@ -8,7 +8,7 @@ PID=`pidof xmms2d xmms2-et` case "$1" in start) stat_busy "Starting xmms2d" - [ -z "$PID" ] && su -c 'xmms2-launcher $XMMS2_PARAMETERS 1>/dev/null 2>/dev/null' - $XMMS2_USER + [ -z "$PID" ] && su -c '/usr/bin/xmms2-launcher $XMMS2_PARAMETERS 1>/dev/null 2>/dev/null' - $XMMS2_USER if [ $? -gt 0 ]; then stat_fail else @@ -18,12 +18,15 @@ case "$1" in ;; stop) stat_busy "Stopping xmms2d" - [ ! -z "$PID" ] && kill $PID &> /dev/null + [ ! -z "$PID" ] && su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER if [ $? -gt 0 ]; then stat_fail else - rm_daemon xmms2d - stat_done + for i in `seq 1 10`; do + [ -d /proc/$PID ] || { stat_done; rm_daemon xmms2d; exit 0; } + sleep 1 + done + stat_fail fi ;; restart) |