From 2b6f5a28e2e55b46c1169228e1e56f3b18dd08b5 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 8 Aug 2011 23:14:38 +0000
Subject: Mon Aug  8 23:14:38 UTC 2011

---
 extra/ossp/PKGBUILD   | 13 ++++++-------
 extra/ossp/osspd.rc.d | 11 ++---------
 2 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'extra/ossp')

diff --git a/extra/ossp/PKGBUILD b/extra/ossp/PKGBUILD
index 964013d1c..2b71ca3f9 100644
--- a/extra/ossp/PKGBUILD
+++ b/extra/ossp/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 99925 2010-11-19 14:16:05Z heftig $
+# $Id: PKGBUILD 132457 2011-07-24 17:19:01Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Jonathan Liu <net147@gmail.com>
 
 pkgname=ossp
 pkgver=1.3.2
-pkgrel=10
+pkgrel=11
 pkgdesc="Emulate OSS device using CUSE"
 arch=(i686 x86_64)
 url="http://sourceforge.net/projects/osspd"
 license=(GPL2)
-depends=('fuse>=2.8.0' 'kernel26>=2.6.35-2')
+depends=('fuse>=2.8.0')
 makedepends=(libpulse alsa-lib)
 optdepends=("libpulse: PulseAudio backend"
             "alsa-lib: ALSA backend")
 backup=(etc/conf.d/osspd)
 source=("http://downloads.sourceforge.net/project/osspd/${pkgname}-${pkgver}.tar.gz"
         osspd.rc.d osspd.conf.d)
+md5sums=('ee2d8c894de2fa4eb3291804fbc7df45'
+         '0c02208ce1dfe74b6e9840f3600678cc'
+         '5a5a3db1bb3c98d48d4794613cf12ef0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -37,7 +40,3 @@ package() {
   install -D -m755 "$srcdir/osspd.rc.d" "$pkgdir/etc/rc.d/osspd"
   install -D -m644 "$srcdir/osspd.conf.d" "$pkgdir/etc/conf.d/osspd"
 }
-
-md5sums=('ee2d8c894de2fa4eb3291804fbc7df45'
-         '69b745e0c499cd50019266a99082ce8b'
-         '5a5a3db1bb3c98d48d4794613cf12ef0')
diff --git a/extra/ossp/osspd.rc.d b/extra/ossp/osspd.rc.d
index 78d7602ae..c5fabf855 100755
--- a/extra/ossp/osspd.rc.d
+++ b/extra/ossp/osspd.rc.d
@@ -14,20 +14,13 @@ if [[ -z "$DSP_SLAVE" ]]; then
   fi
 fi
 
-preclaim_oss=/sys/module/soundcore/parameters/preclaim_oss
-
 PID=`pidof -o %PPID /usr/sbin/osspd`
 case "$1" in
   start)
     stat_busy "Starting OSS userspace bridge"
     if [ -z "$PID" ]; then 
-      if [[ -r $preclaim_oss && "$(cat $preclaim_oss)" -eq 1 ]]; then
-        echo "Must boot with soundcore.preclaim_oss=0"
-        stat_die
-      fi
-      modprobe cuse &>/dev/null
-      modprobe -r snd-pcm-oss snd-mixer-oss &>/dev/null
-      sleep 0.1
+      /sbin/modprobe cuse &>/dev/null
+      /sbin/udevadm settle --quiet
       /usr/sbin/osspd --dsp-slave="$DSP_SLAVE"
     fi
     if [ -n "$PID" -o $? -gt 0 ]; then
-- 
cgit v1.2.3-54-g00ecf