[arch-commits] Commit in ossp/repos (16 files)

Jan Steffens heftig at nymeria.archlinux.org
Mon May 13 05:48:39 UTC 2013


    Date: Monday, May 13, 2013 @ 07:48:38
  Author: heftig
Revision: 185305

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  ossp/repos/extra-i686/PKGBUILD
    (from rev 185304, ossp/trunk/PKGBUILD)
  ossp/repos/extra-i686/osspd.modules-load
    (from rev 185304, ossp/trunk/osspd.modules-load)
  ossp/repos/extra-i686/osspd.service
    (from rev 185304, ossp/trunk/osspd.service)
  ossp/repos/extra-x86_64/PKGBUILD
    (from rev 185304, ossp/trunk/PKGBUILD)
  ossp/repos/extra-x86_64/osspd.modules-load
    (from rev 185304, ossp/trunk/osspd.modules-load)
  ossp/repos/extra-x86_64/osspd.service
    (from rev 185304, ossp/trunk/osspd.service)
Deleted:
  ossp/repos/extra-i686/PKGBUILD
  ossp/repos/extra-i686/osspd.conf.d
  ossp/repos/extra-i686/osspd.modules-load
  ossp/repos/extra-i686/osspd.rc.d
  ossp/repos/extra-i686/osspd.service
  ossp/repos/extra-x86_64/PKGBUILD
  ossp/repos/extra-x86_64/osspd.conf.d
  ossp/repos/extra-x86_64/osspd.modules-load
  ossp/repos/extra-x86_64/osspd.rc.d
  ossp/repos/extra-x86_64/osspd.service

---------------------------------+
 /PKGBUILD                       |   82 ++++++++++++++++++++++++++++++++++++++
 /osspd.modules-load             |    4 +
 /osspd.service                  |   16 +++++++
 extra-i686/PKGBUILD             |   49 ----------------------
 extra-i686/osspd.conf.d         |   10 ----
 extra-i686/osspd.modules-load   |    2 
 extra-i686/osspd.rc.d           |   52 ------------------------
 extra-i686/osspd.service        |    8 ---
 extra-x86_64/PKGBUILD           |   49 ----------------------
 extra-x86_64/osspd.conf.d       |   10 ----
 extra-x86_64/osspd.modules-load |    2 
 extra-x86_64/osspd.rc.d         |   52 ------------------------
 extra-x86_64/osspd.service      |    8 ---
 13 files changed, 102 insertions(+), 242 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-05-13 05:46:37 UTC (rev 185304)
+++ extra-i686/PKGBUILD	2013-05-13 05:48:38 UTC (rev 185305)
@@ -1,49 +0,0 @@
-# $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=14
-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'
-         'c58d5107a299fb26ae2099fa4b5ca6a1'
-         '5a5a3db1bb3c98d48d4794613cf12ef0'
-         '98dc2b2f55f69e3d2fb37f32742d30d4'
-         '36c01e144db7cf253df12d8ad9dac942')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  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 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"
-}

Copied: ossp/repos/extra-i686/PKGBUILD (from rev 185304, ossp/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-05-13 05:48:38 UTC (rev 185305)
@@ -0,0 +1,41 @@
+# $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=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 git)
+optdepends=("libpulse: PulseAudio backend"
+            "alsa-lib: ALSA backend")
+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 $pkgname
+  make
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" prefix=/usr UDEVDIR=/usr/lib/udev/rules.d install
+
+  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"
+}

Deleted: extra-i686/osspd.conf.d
===================================================================
--- extra-i686/osspd.conf.d	2013-05-13 05:46:37 UTC (rev 185304)
+++ extra-i686/osspd.conf.d	2013-05-13 05:48:38 UTC (rev 185305)
@@ -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: extra-i686/osspd.modules-load
===================================================================
--- extra-i686/osspd.modules-load	2013-05-13 05:46:37 UTC (rev 185304)
+++ extra-i686/osspd.modules-load	2013-05-13 05:48:38 UTC (rev 185305)
@@ -1,2 +0,0 @@
-cuse
-snd-seq-oss

Copied: ossp/repos/extra-i686/osspd.modules-load (from rev 185304, ossp/trunk/osspd.modules-load)
===================================================================
--- extra-i686/osspd.modules-load	                        (rev 0)
+++ extra-i686/osspd.modules-load	2013-05-13 05:48:38 UTC (rev 185305)
@@ -0,0 +1,2 @@
+cuse
+snd-seq-oss

Deleted: extra-i686/osspd.rc.d
===================================================================
--- extra-i686/osspd.rc.d	2013-05-13 05:46:37 UTC (rev 185304)
+++ extra-i686/osspd.rc.d	2013-05-13 05:48:38 UTC (rev 185305)
@@ -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:

Deleted: extra-i686/osspd.service
===================================================================
--- extra-i686/osspd.service	2013-05-13 05:46:37 UTC (rev 185304)
+++ extra-i686/osspd.service	2013-05-13 05:48:38 UTC (rev 185305)
@@ -1,8 +0,0 @@
-[Unit]
-Description=OSS Userspace Bridge
-
-[Service]
-ExecStart=/usr/sbin/osspd -f
-
-[Install]
-WantedBy=multi-user.target

Copied: ossp/repos/extra-i686/osspd.service (from rev 185304, ossp/trunk/osspd.service)
===================================================================
--- extra-i686/osspd.service	                        (rev 0)
+++ extra-i686/osspd.service	2013-05-13 05:48:38 UTC (rev 185305)
@@ -0,0 +1,8 @@
+[Unit]
+Description=OSS Userspace Bridge
+
+[Service]
+ExecStart=/usr/bin/osspd -f
+
+[Install]
+WantedBy=multi-user.target

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-05-13 05:46:37 UTC (rev 185304)
+++ extra-x86_64/PKGBUILD	2013-05-13 05:48:38 UTC (rev 185305)
@@ -1,49 +0,0 @@
-# $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=14
-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'
-         'c58d5107a299fb26ae2099fa4b5ca6a1'
-         '5a5a3db1bb3c98d48d4794613cf12ef0'
-         '98dc2b2f55f69e3d2fb37f32742d30d4'
-         '36c01e144db7cf253df12d8ad9dac942')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  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 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"
-}

Copied: ossp/repos/extra-x86_64/PKGBUILD (from rev 185304, ossp/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-05-13 05:48:38 UTC (rev 185305)
@@ -0,0 +1,41 @@
+# $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=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 git)
+optdepends=("libpulse: PulseAudio backend"
+            "alsa-lib: ALSA backend")
+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 $pkgname
+  make
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" prefix=/usr UDEVDIR=/usr/lib/udev/rules.d install
+
+  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"
+}

Deleted: extra-x86_64/osspd.conf.d
===================================================================
--- extra-x86_64/osspd.conf.d	2013-05-13 05:46:37 UTC (rev 185304)
+++ extra-x86_64/osspd.conf.d	2013-05-13 05:48:38 UTC (rev 185305)
@@ -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: extra-x86_64/osspd.modules-load
===================================================================
--- extra-x86_64/osspd.modules-load	2013-05-13 05:46:37 UTC (rev 185304)
+++ extra-x86_64/osspd.modules-load	2013-05-13 05:48:38 UTC (rev 185305)
@@ -1,2 +0,0 @@
-cuse
-snd-seq-oss

Copied: ossp/repos/extra-x86_64/osspd.modules-load (from rev 185304, ossp/trunk/osspd.modules-load)
===================================================================
--- extra-x86_64/osspd.modules-load	                        (rev 0)
+++ extra-x86_64/osspd.modules-load	2013-05-13 05:48:38 UTC (rev 185305)
@@ -0,0 +1,2 @@
+cuse
+snd-seq-oss

Deleted: extra-x86_64/osspd.rc.d
===================================================================
--- extra-x86_64/osspd.rc.d	2013-05-13 05:46:37 UTC (rev 185304)
+++ extra-x86_64/osspd.rc.d	2013-05-13 05:48:38 UTC (rev 185305)
@@ -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:

Deleted: extra-x86_64/osspd.service
===================================================================
--- extra-x86_64/osspd.service	2013-05-13 05:46:37 UTC (rev 185304)
+++ extra-x86_64/osspd.service	2013-05-13 05:48:38 UTC (rev 185305)
@@ -1,8 +0,0 @@
-[Unit]
-Description=OSS Userspace Bridge
-
-[Service]
-ExecStart=/usr/sbin/osspd -f
-
-[Install]
-WantedBy=multi-user.target

Copied: ossp/repos/extra-x86_64/osspd.service (from rev 185304, ossp/trunk/osspd.service)
===================================================================
--- extra-x86_64/osspd.service	                        (rev 0)
+++ extra-x86_64/osspd.service	2013-05-13 05:48:38 UTC (rev 185305)
@@ -0,0 +1,8 @@
+[Unit]
+Description=OSS Userspace Bridge
+
+[Service]
+ExecStart=/usr/bin/osspd -f
+
+[Install]
+WantedBy=multi-user.target




More information about the arch-commits mailing list