diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-20 11:12:20 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-20 11:12:20 -0300 |
commit | 5c0a5f2b9fa7f1683f279728342aa7f5f0cf90a3 (patch) | |
tree | a55da6178b48e7abe9508505d3e92cf02a03da52 /community/cdemu-daemon | |
parent | c56b2c50f5748090efb9f10f2a021e57a2455764 (diff) | |
parent | 1a136cf48dd7f710f38ff998182508f5a0d41c35 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/comix/PKGBUILD
community/geany/PKGBUILD
community/gnome-do-docklets/PKGBUILD
community/gnome-do-plugins/PKGBUILD
community/gnome-system-tools/PKGBUILD
community/gnustep-make/PKGBUILD
community/gtweakui/PKGBUILD
community/hwinfo/PKGBUILD
community/kungfu/PKGBUILD
community/liboauth/PKGBUILD
community/liboobs/PKGBUILD
community/lua-lzlib/PKGBUILD
community/mcdp/PKGBUILD
community/mingw32-gcc-base/PKGBUILD
community/mingw32-runtime/PKGBUILD
community/mplayer2/PKGBUILD
community/pdf2svg/PKGBUILD
community/perl-data-dumper/PKGBUILD
community/perl-digest-md5/PKGBUILD
community/perl-perlio-eol/PKGBUILD
community/perl-xml-libxslt/PKGBUILD
community/python-cherrypy/PKGBUILD
community/python-pexpect/PKGBUILD
community/python-pyro/PKGBUILD
community/python2-cherrypy/PKGBUILD
community/rexima/PKGBUILD
community/shp2svg/PKGBUILD
community/system-tools-backends/PKGBUILD
community/tracker/PKGBUILD
community/virtualbox/PKGBUILD
core/bridge-utils/PKGBUILD
extra/avidemux/PKGBUILD
extra/beagle/PKGBUILD
extra/bug-buddy/PKGBUILD
extra/dssi/PKGBUILD
extra/evolution-sharp/PKGBUILD
extra/evolution-webcal/PKGBUILD
extra/feh/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gnome-mag/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/gnutls/PKGBUILD
extra/gok/PKGBUILD
extra/gpsd/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/hyphen/PKGBUILD
extra/kdelibs/PKGBUILD
extra/keytouch-editor/PKGBUILD
extra/keytouch/PKGBUILD
extra/koffice/PKGBUILD
extra/krusader/PKGBUILD
extra/libbeagle/PKGBUILD
extra/libffi/PKGBUILD
extra/libgnomeuimm/PKGBUILD
extra/libreoffice/PKGBUILD
extra/m17n-lib/PKGBUILD
extra/mtr/PKGBUILD
extra/openbabel/PKGBUILD
extra/poppler/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/rox/PKGBUILD
extra/transmission/PKGBUILD
extra/xf86-input-synaptics/PKGBUILD
extra/xorg-server/PKGBUILD
extra/xorg-xinit/PKGBUILD
kde-unstable/calligra/PKGBUILD
libre/icecat/PKGBUILD
libre/linux-libre/PKGBUILD
multilib/lib32-ncurses/PKGBUILD
multilib/lib32-openssl/PKGBUILD
multilib/lib32-talloc/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'community/cdemu-daemon')
-rw-r--r-- | community/cdemu-daemon/PKGBUILD | 14 | ||||
-rw-r--r-- | community/cdemu-daemon/cdemud.conf | 4 | ||||
-rw-r--r-- | community/cdemu-daemon/cdemud.rc | 5 |
3 files changed, 13 insertions, 10 deletions
diff --git a/community/cdemu-daemon/PKGBUILD b/community/cdemu-daemon/PKGBUILD index 61ed46c7b..da6024658 100644 --- a/community/cdemu-daemon/PKGBUILD +++ b/community/cdemu-daemon/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 40133 2011-02-20 13:02:28Z jelle $ +# $Id: PKGBUILD 57021 2011-10-18 18:14:16Z bpiotrowski $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> pkgname=cdemu-daemon -pkgver=1.3.0 -pkgrel=4 +pkgver=1.4.0 +pkgrel=1 pkgdesc="CD/DVD-ROM device emulator daemon" arch=('i686' 'x86_64' 'mips64el') backup=('etc/conf.d/cdemud' 'etc/dbus-1/system.d/cdemud-dbus.conf') url="http://cdemu.sourceforge.net/" license=('GPL') -depends=('glib2' 'dbus' 'dbus-glib' 'libdaemon' 'vhba-module' 'libmirage' 'libao') +depends=('glib2' 'dbus' 'dbus-glib' 'libdaemon' 'vhba-module' "libmirage=$pkgver" 'libao') install=cdemud.install source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz cdemud.conf cdemud.rc 60-vhba.rules) -md5sums=('4ec07bd202ac1dcc2f352fc394268d67' - '26b94a626c2c1d0a83ad5a7593dff70f' - '655b2bf46802f2fa7821a649cecd1c4d' +md5sums=('f7ccc0abc33057d552ec7b0925fce63a' + '2b94bd399873e585e40b2bfd8634f322' + '340a30ab2c42162b3bd042c74a399219' '93324b320e7b68d01ad9a0b548018ed5') build() { diff --git a/community/cdemu-daemon/cdemud.conf b/community/cdemu-daemon/cdemud.conf index 91ada613f..8e49cdfd5 100644 --- a/community/cdemu-daemon/cdemud.conf +++ b/community/cdemu-daemon/cdemud.conf @@ -6,3 +6,7 @@ CTL_DEVICE=/dev/vhba_ctl # audio backend (null or alsa) AUDIO_BACKEND=null + +DAEMON="/usr/bin/cdemud" +BUS="system" +LOG_FILE="/var/log/cdemu.log" diff --git a/community/cdemu-daemon/cdemud.rc b/community/cdemu-daemon/cdemud.rc index c13fa6239..6e1b0b091 100644 --- a/community/cdemu-daemon/cdemud.rc +++ b/community/cdemu-daemon/cdemud.rc @@ -7,7 +7,6 @@ case "$1" in start) stat_busy "Loading vhba and loop modules" - modprobe loop modprobe vhba if [ $? -ne 0 ]; then stat_fail @@ -28,7 +27,7 @@ case "$1" in fi stat_busy "Starting cdemud" - cdemud -d -n $NUM_DRIVES -c $CTL_DEVICE -a $AUDIO_BACKEND &>/dev/null + cdemud --ctl-device=$CTL_DEVICE --bus=$SYSTEM --num-devices=$NUM_DEVICES --audio-driver=$AUDIO_DRIVER --logfile=$LOG_FILE & if [ $? -ne 0 ]; then stat_fail else @@ -38,7 +37,7 @@ case "$1" in ;; stop) stat_busy "Stopping cdemud" - cdemud -k &>/dev/null + kill -9 `pidof cdemud` &>/dev/null && sleep 1 && rmmod vhba if [ $? -ne 0 ]; then stat_fail else |