[arch-commits] Commit in ossp/repos (16 files)
Jan Steffens
heftig at archlinux.org
Tue Feb 7 16:52:38 UTC 2012
Date: Tuesday, February 7, 2012 @ 11:52:37
Author: heftig
Revision: 149425
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
ossp/repos/extra-i686/PKGBUILD
(from rev 149424, ossp/trunk/PKGBUILD)
ossp/repos/extra-i686/osspd.conf.d
(from rev 149424, ossp/trunk/osspd.conf.d)
ossp/repos/extra-i686/osspd.modules-load
(from rev 149424, ossp/trunk/osspd.modules-load)
ossp/repos/extra-i686/osspd.rc.d
(from rev 149424, ossp/trunk/osspd.rc.d)
ossp/repos/extra-i686/osspd.service
(from rev 149424, ossp/trunk/osspd.service)
ossp/repos/extra-x86_64/PKGBUILD
(from rev 149424, ossp/trunk/PKGBUILD)
ossp/repos/extra-x86_64/osspd.conf.d
(from rev 149424, ossp/trunk/osspd.conf.d)
ossp/repos/extra-x86_64/osspd.modules-load
(from rev 149424, ossp/trunk/osspd.modules-load)
ossp/repos/extra-x86_64/osspd.rc.d
(from rev 149424, ossp/trunk/osspd.rc.d)
ossp/repos/extra-x86_64/osspd.service
(from rev 149424, ossp/trunk/osspd.service)
Deleted:
ossp/repos/extra-i686/PKGBUILD
ossp/repos/extra-i686/osspd.conf.d
ossp/repos/extra-i686/osspd.rc.d
ossp/repos/extra-x86_64/PKGBUILD
ossp/repos/extra-x86_64/osspd.conf.d
ossp/repos/extra-x86_64/osspd.rc.d
---------------------------------+
extra-i686/PKGBUILD | 91 +++++++++++++++++----------------
extra-i686/osspd.conf.d | 20 +++----
extra-i686/osspd.modules-load | 2
extra-i686/osspd.rc.d | 104 +++++++++++++++++++-------------------
extra-i686/osspd.service | 8 ++
extra-x86_64/PKGBUILD | 91 +++++++++++++++++----------------
extra-x86_64/osspd.conf.d | 20 +++----
extra-x86_64/osspd.modules-load | 2
extra-x86_64/osspd.rc.d | 104 +++++++++++++++++++-------------------
extra-x86_64/osspd.service | 8 ++
10 files changed, 242 insertions(+), 208 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-02-07 16:51:11 UTC (rev 149424)
+++ extra-i686/PKGBUILD 2012-02-07 16:52:37 UTC (rev 149425)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
-# Contributor: Jonathan Liu <net147 at gmail.com>
-
-pkgname=ossp
-pkgver=1.3.2
-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')
-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"
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" prefix=/usr UDEVDIR=/lib/udev/rules.d install
-
- # Make compatible with udev ACLs
- sed -e 's/GROUP="audio"/SUBSYSTEM=="cuse", MODE="0666"/' \
- -i "$pkgdir/lib/udev/rules.d/98-osscuse.rules"
-
- install -D -m644 README "$pkgdir/usr/share/doc/$pkgname/README"
-
- install -D -m755 "$srcdir/osspd.rc.d" "$pkgdir/etc/rc.d/osspd"
- install -D -m644 "$srcdir/osspd.conf.d" "$pkgdir/etc/conf.d/osspd"
-}
Copied: ossp/repos/extra-i686/PKGBUILD (from rev 149424, ossp/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-07 16:52:37 UTC (rev 149425)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jonathan Liu <net147 at gmail.com>
+
+pkgname=ossp
+pkgver=1.3.2
+pkgrel=12
+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)
+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'
+ '103d9d1b4d89872618ffa0326ddf93f1'
+ '5a5a3db1bb3c98d48d4794613cf12ef0'
+ '98dc2b2f55f69e3d2fb37f32742d30d4'
+ '36c01e144db7cf253df12d8ad9dac942')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" prefix=/usr UDEVDIR=/lib/udev/rules.d install
+
+ # Make compatible with udev ACLs
+ sed -e 's/GROUP="audio"/SUBSYSTEM=="cuse", MODE="0666"/' \
+ -i "$pkgdir/lib/udev/rules.d/98-osscuse.rules"
+
+ 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/lib/systemd/system/osspd.service"
+ install -Dm644 "$srcdir/osspd.modules-load" "$pkgdir/usr/lib/modules-load.d/osspd.conf"
+}
Deleted: extra-i686/osspd.conf.d
===================================================================
--- extra-i686/osspd.conf.d 2012-02-07 16:51:11 UTC (rev 149424)
+++ extra-i686/osspd.conf.d 2012-02-07 16:52:37 UTC (rev 149425)
@@ -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:
Copied: ossp/repos/extra-i686/osspd.conf.d (from rev 149424, ossp/trunk/osspd.conf.d)
===================================================================
--- extra-i686/osspd.conf.d (rev 0)
+++ extra-i686/osspd.conf.d 2012-02-07 16:52:37 UTC (rev 149425)
@@ -0,0 +1,10 @@
+# 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:
Copied: ossp/repos/extra-i686/osspd.modules-load (from rev 149424, ossp/trunk/osspd.modules-load)
===================================================================
--- extra-i686/osspd.modules-load (rev 0)
+++ extra-i686/osspd.modules-load 2012-02-07 16:52:37 UTC (rev 149425)
@@ -0,0 +1,2 @@
+cuse
+snd-seq-oss
Deleted: extra-i686/osspd.rc.d
===================================================================
--- extra-i686/osspd.rc.d 2012-02-07 16:51:11 UTC (rev 149424)
+++ extra-i686/osspd.rc.d 2012-02-07 16:52:37 UTC (rev 149425)
@@ -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
- /sbin/modprobe cuse &>/dev/null
- /sbin/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:
Copied: ossp/repos/extra-i686/osspd.rc.d (from rev 149424, ossp/trunk/osspd.rc.d)
===================================================================
--- extra-i686/osspd.rc.d (rev 0)
+++ extra-i686/osspd.rc.d 2012-02-07 16:52:37 UTC (rev 149425)
@@ -0,0 +1,52 @@
+#!/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
+ /sbin/modprobe -a cuse snd-seq-oss &>/dev/null
+ /sbin/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:
Copied: ossp/repos/extra-i686/osspd.service (from rev 149424, ossp/trunk/osspd.service)
===================================================================
--- extra-i686/osspd.service (rev 0)
+++ extra-i686/osspd.service 2012-02-07 16:52:37 UTC (rev 149425)
@@ -0,0 +1,8 @@
+[Unit]
+Description=OSS Userspace Bridge
+
+[Service]
+ExecStart=/usr/sbin/osspd -f
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-02-07 16:51:11 UTC (rev 149424)
+++ extra-x86_64/PKGBUILD 2012-02-07 16:52:37 UTC (rev 149425)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
-# Contributor: Jonathan Liu <net147 at gmail.com>
-
-pkgname=ossp
-pkgver=1.3.2
-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')
-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"
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" prefix=/usr UDEVDIR=/lib/udev/rules.d install
-
- # Make compatible with udev ACLs
- sed -e 's/GROUP="audio"/SUBSYSTEM=="cuse", MODE="0666"/' \
- -i "$pkgdir/lib/udev/rules.d/98-osscuse.rules"
-
- install -D -m644 README "$pkgdir/usr/share/doc/$pkgname/README"
-
- install -D -m755 "$srcdir/osspd.rc.d" "$pkgdir/etc/rc.d/osspd"
- install -D -m644 "$srcdir/osspd.conf.d" "$pkgdir/etc/conf.d/osspd"
-}
Copied: ossp/repos/extra-x86_64/PKGBUILD (from rev 149424, ossp/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-02-07 16:52:37 UTC (rev 149425)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jonathan Liu <net147 at gmail.com>
+
+pkgname=ossp
+pkgver=1.3.2
+pkgrel=12
+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)
+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'
+ '103d9d1b4d89872618ffa0326ddf93f1'
+ '5a5a3db1bb3c98d48d4794613cf12ef0'
+ '98dc2b2f55f69e3d2fb37f32742d30d4'
+ '36c01e144db7cf253df12d8ad9dac942')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" prefix=/usr UDEVDIR=/lib/udev/rules.d install
+
+ # Make compatible with udev ACLs
+ sed -e 's/GROUP="audio"/SUBSYSTEM=="cuse", MODE="0666"/' \
+ -i "$pkgdir/lib/udev/rules.d/98-osscuse.rules"
+
+ 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/lib/systemd/system/osspd.service"
+ install -Dm644 "$srcdir/osspd.modules-load" "$pkgdir/usr/lib/modules-load.d/osspd.conf"
+}
Deleted: extra-x86_64/osspd.conf.d
===================================================================
--- extra-x86_64/osspd.conf.d 2012-02-07 16:51:11 UTC (rev 149424)
+++ extra-x86_64/osspd.conf.d 2012-02-07 16:52:37 UTC (rev 149425)
@@ -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:
Copied: ossp/repos/extra-x86_64/osspd.conf.d (from rev 149424, ossp/trunk/osspd.conf.d)
===================================================================
--- extra-x86_64/osspd.conf.d (rev 0)
+++ extra-x86_64/osspd.conf.d 2012-02-07 16:52:37 UTC (rev 149425)
@@ -0,0 +1,10 @@
+# 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:
Copied: ossp/repos/extra-x86_64/osspd.modules-load (from rev 149424, ossp/trunk/osspd.modules-load)
===================================================================
--- extra-x86_64/osspd.modules-load (rev 0)
+++ extra-x86_64/osspd.modules-load 2012-02-07 16:52:37 UTC (rev 149425)
@@ -0,0 +1,2 @@
+cuse
+snd-seq-oss
Deleted: extra-x86_64/osspd.rc.d
===================================================================
--- extra-x86_64/osspd.rc.d 2012-02-07 16:51:11 UTC (rev 149424)
+++ extra-x86_64/osspd.rc.d 2012-02-07 16:52:37 UTC (rev 149425)
@@ -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
- /sbin/modprobe cuse &>/dev/null
- /sbin/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:
Copied: ossp/repos/extra-x86_64/osspd.rc.d (from rev 149424, ossp/trunk/osspd.rc.d)
===================================================================
--- extra-x86_64/osspd.rc.d (rev 0)
+++ extra-x86_64/osspd.rc.d 2012-02-07 16:52:37 UTC (rev 149425)
@@ -0,0 +1,52 @@
+#!/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
+ /sbin/modprobe -a cuse snd-seq-oss &>/dev/null
+ /sbin/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:
Copied: ossp/repos/extra-x86_64/osspd.service (from rev 149424, ossp/trunk/osspd.service)
===================================================================
--- extra-x86_64/osspd.service (rev 0)
+++ extra-x86_64/osspd.service 2012-02-07 16:52:37 UTC (rev 149425)
@@ -0,0 +1,8 @@
+[Unit]
+Description=OSS Userspace Bridge
+
+[Service]
+ExecStart=/usr/sbin/osspd -f
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list