From 6c5c865fa6674610732dd8427bf8f09f3c166299 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 19 Oct 2011 23:14:52 +0000
Subject: Wed Oct 19 23:14:52 UTC 2011

---
 community/cdemu-daemon/PKGBUILD    | 14 +++++++-------
 community/cdemu-daemon/cdemud.conf |  4 ++++
 community/cdemu-daemon/cdemud.rc   |  5 ++---
 3 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'community/cdemu-daemon')

diff --git a/community/cdemu-daemon/PKGBUILD b/community/cdemu-daemon/PKGBUILD
index bdea742ae..dd47d1248 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')
 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
-- 
cgit v1.2.3-54-g00ecf