diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-09 18:15:39 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-09 18:15:39 -0300 |
commit | f35184e8782d5fe7fc3ea3f11042b29913cde6d8 (patch) | |
tree | c984d07cfb1cb491f5e7a71f3771a81001398d74 /extra/ossp | |
parent | 520f5964346341a33a8337c8fd5b1afa10de6d5b (diff) | |
parent | 54b7119c36756b86ea463649ee972cd6c1ce5863 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/nload/PKGBUILD
core/glibc/PKGBUILD
extra/aalib/PKGBUILD
extra/apache/PKGBUILD
extra/jasper/PKGBUILD
extra/libasyncns/PKGBUILD
extra/libvorbis/PKGBUILD
extra/libxslt/PKGBUILD
extra/xfce4-timer-plugin/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
staging/xorg-xinput/PKGBUILD
Diffstat (limited to 'extra/ossp')
-rw-r--r-- | extra/ossp/PKGBUILD | 25 | ||||
-rw-r--r-- | extra/ossp/osspd.modules-load | 2 | ||||
-rwxr-xr-x | extra/ossp/osspd.rc.d | 2 | ||||
-rw-r--r-- | extra/ossp/osspd.service | 8 |
4 files changed, 27 insertions, 10 deletions
diff --git a/extra/ossp/PKGBUILD b/extra/ossp/PKGBUILD index 6d2401833..41b6efc68 100644 --- a/extra/ossp/PKGBUILD +++ b/extra/ossp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 132457 2011-07-24 17:19:01Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 149425 2012-02-07 16:52:37Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jonathan Liu <net147@gmail.com> pkgname=ossp pkgver=1.3.2 -pkgrel=11 +pkgrel=12 pkgdesc="Emulate OSS device using CUSE" arch=(i686 x86_64 'mips64el') url="http://sourceforge.net/projects/osspd" @@ -15,10 +15,12 @@ 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.rc.d osspd.conf.d osspd.service osspd.modules-load) md5sums=('ee2d8c894de2fa4eb3291804fbc7df45' - '0c02208ce1dfe74b6e9840f3600678cc' - '5a5a3db1bb3c98d48d4794613cf12ef0') + '103d9d1b4d89872618ffa0326ddf93f1' + '5a5a3db1bb3c98d48d4794613cf12ef0' + '98dc2b2f55f69e3d2fb37f32742d30d4' + '36c01e144db7cf253df12d8ad9dac942') build() { cd "$srcdir/$pkgname-$pkgver" @@ -35,8 +37,13 @@ package() { 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 -Dm644 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" + # 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" } diff --git a/extra/ossp/osspd.modules-load b/extra/ossp/osspd.modules-load new file mode 100644 index 000000000..35578317b --- /dev/null +++ b/extra/ossp/osspd.modules-load @@ -0,0 +1,2 @@ +cuse +snd-seq-oss diff --git a/extra/ossp/osspd.rc.d b/extra/ossp/osspd.rc.d index c5fabf855..2b8e94506 100755 --- a/extra/ossp/osspd.rc.d +++ b/extra/ossp/osspd.rc.d @@ -19,7 +19,7 @@ case "$1" in start) stat_busy "Starting OSS userspace bridge" if [ -z "$PID" ]; then - /sbin/modprobe cuse &>/dev/null + /sbin/modprobe -a cuse snd-seq-oss &>/dev/null /sbin/udevadm settle --quiet /usr/sbin/osspd --dsp-slave="$DSP_SLAVE" fi diff --git a/extra/ossp/osspd.service b/extra/ossp/osspd.service new file mode 100644 index 000000000..f0a5f3306 --- /dev/null +++ b/extra/ossp/osspd.service @@ -0,0 +1,8 @@ +[Unit] +Description=OSS Userspace Bridge + +[Service] +ExecStart=/usr/sbin/osspd -f + +[Install] +WantedBy=multi-user.target |