[arch-commits] Commit in ossp/trunk (PKGBUILD osspd.conf.d osspd.rc.d osspd.service)

[Jan Steffens]

    Date: Monday, May 13, 2013 @ 07:46:37
  Author: heftig
Revision: 185304

Remove rc.d; bin move; git source

Modified:
  ossp/trunk/PKGBUILD
  ossp/trunk/osspd.service
Deleted:
  ossp/trunk/osspd.conf.d
  ossp/trunk/osspd.rc.d

---------------+
 PKGBUILD      |   40 ++++++++++++++++------------------------
 osspd.conf.d  |   10 ----------
 osspd.rc.d    |   52 ----------------------------------------------------
 osspd.service |    2 +-
 4 files changed, 17 insertions(+), 87 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 05:23:45 UTC (rev 185303)
+++ PKGBUILD	2013-05-13 05:46:37 UTC (rev 185304)
@@ -4,46 +4,38 @@
 
 pkgname=ossp
 pkgver=1.3.2
-pkgrel=14
+pkgrel=15
 pkgdesc="Emulate OSS device using CUSE"
 arch=(i686 x86_64)
 url="http://sourceforge.net/projects/osspd"
 license=(GPL2)
 depends=('fuse>=2.8.0')
-makedepends=(libpulse alsa-lib)
+makedepends=(libpulse alsa-lib git)
 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 osspd.service osspd.modules-load)
-md5sums=('ee2d8c894de2fa4eb3291804fbc7df45'
-         'c58d5107a299fb26ae2099fa4b5ca6a1'
-         '5a5a3db1bb3c98d48d4794613cf12ef0'
-         '98dc2b2f55f69e3d2fb37f32742d30d4'
+source=('ossp::git://git.code.sf.net/p/osspd/code#commit=097dc7b'
+        osspd.service osspd.modules-load)
+md5sums=('SKIP'
+         'd084bd24e3dff167541dd3ff860cdebf'
          '36c01e144db7cf253df12d8ad9dac942')
 
+prepare() {
+  cd $pkgname
+  sed -i 's|/sbin|/bin|g' Makefile
+  sed -i 's|GROUP="audio"|SUBSYSTEM=="cuse", MODE="0666"|' 98-osscuse.rules
+}
+
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
+  cd $pkgname
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
+  cd $pkgname
   make DESTDIR="$pkgdir" prefix=/usr UDEVDIR=/usr/lib/udev/rules.d install
 
-  # Make compatible with udev ACLs
-  sed -e 's/GROUP="audio"/SUBSYSTEM=="cuse", MODE="0666"/' \
-      -i "$pkgdir/usr/lib/udev/rules.d/98-osscuse.rules"
+  install -Dm644 "$srcdir/osspd.service" "$pkgdir/usr/lib/systemd/system/osspd.service"
+  install -Dm644 "$srcdir/osspd.modules-load" "$pkgdir/usr/lib/modules-load.d/osspd.conf"
 
   install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README"
-
-  # initscripts
-  install -Dm755 "$srcdir/osspd.rc.d" "$pkgdir/etc/rc.d/osspd"
-  install -Dm644 "$srcdir/osspd.conf.d" "$pkgdir/etc/conf.d/osspd"
-
-  # systemd
-  install -Dm644 "$srcdir/osspd.service" "$pkgdir/usr/lib/systemd/system/osspd.service"
-  install -Dm644 "$srcdir/osspd.modules-load" "$pkgdir/usr/lib/modules-load.d/osspd.conf"
 }

Deleted: osspd.conf.d
===================================================================
--- osspd.conf.d	2013-05-13 05:23:45 UTC (rev 185303)
+++ osspd.conf.d	2013-05-13 05:46:37 UTC (rev 185304)
@@ -1,10 +0,0 @@
-# Define the audio backend to use here.
-# Leave undefined to autodetect.
-
-# Use Pulseaudio slave
-#DSP_SLAVE=/usr/sbin/ossp-padsp
-
-# Use ALSA slave
-#DSP_SLAVE=/usr/sbin/ossp-alsap
-
-# vim:set ft=sh:

Deleted: osspd.rc.d
===================================================================
--- osspd.rc.d	2013-05-13 05:23:45 UTC (rev 185303)
+++ osspd.rc.d	2013-05-13 05:46:37 UTC (rev 185304)
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/osspd
-
-
-if [[ -z "$DSP_SLAVE" ]]; then
-  # Autodetect
-  if [[ -x /usr/bin/pulseaudio ]]; then
-    DSP_SLAVE="/usr/sbin/ossp-padsp"
-  else
-    DSP_SLAVE="/usr/sbin/ossp-alsap"
-  fi
-fi
-
-PID=`pidof -o %PPID /usr/sbin/osspd`
-case "$1" in
-  start)
-    stat_busy "Starting OSS userspace bridge"
-    if [ -z "$PID" ]; then 
-      modprobe -a cuse snd-seq-oss &>/dev/null
-      udevadm settle --quiet
-      /usr/sbin/osspd --dsp-slave="$DSP_SLAVE"
-    fi
-    if [ -n "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon osspd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping OSS userspace bridge"
-    [ -n "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon osspd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-
-# vim:set ft=sh:

Modified: osspd.service
===================================================================
--- osspd.service	2013-05-13 05:23:45 UTC (rev 185303)
+++ osspd.service	2013-05-13 05:46:37 UTC (rev 185304)
@@ -2,7 +2,7 @@
 Description=OSS Userspace Bridge
 
 [Service]
-ExecStart=/usr/sbin/osspd -f
+ExecStart=/usr/bin/osspd -f
 
 [Install]
 WantedBy=multi-user.target