From c5a71e644170253b683ba06b97855fbdffa6bec3 Mon Sep 17 00:00:00 2001
From: Duncaen <mail@duncano.de>
Date: Fri, 8 Dec 2017 18:17:57 +0100
Subject: [PATCH] sndio: fix service and split into libsndio

Based on changes from @ebfe:
Let sndio drop privileges so it creates a unix socket clients can find
(/tmp/aucat/aucatX). Add sndiod to the audio group so it can access
/dev/snd/* devices. Use the primary group for it to let sndiod use the
right path for the listening unix socket.
---
 common/shlibs                  |  2 +-
 srcpkgs/libsndio               |  1 +
 srcpkgs/sndio/files/sndiod/run |  3 ++-
 srcpkgs/sndio/template         | 11 +++++++++--
 4 files changed, 13 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/libsndio

diff --git a/common/shlibs b/common/shlibs
index 62f29ca6d55..44765ce4ccd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1973,7 +1973,7 @@ libKF5CddbWidgets.so.5 libkcddb-17.08.2_1
 libKF5Cddb.so.5 libkcddb-17.08.2_1
 libk3bdevice.so.7 k3b-17.08.2_1
 libk3blib.so.7 k3b-17.08.2_1
-libsndio.so.6.1 sndio-1.1.0_1
+libsndio.so.6.1 libsndio-1.2.0_2
 libopenconnect.so.5 openconnect-7.05_1
 libusbredirparser.so.1 usbredir-0.7_1
 libusbredirhost.so.1 usbredir-0.7_1
diff --git a/srcpkgs/libsndio b/srcpkgs/libsndio
new file mode 120000
index 00000000000..f463c54366d
--- /dev/null
+++ b/srcpkgs/libsndio
@@ -0,0 +1 @@
+sndio
\ No newline at end of file
diff --git a/srcpkgs/sndio/files/sndiod/run b/srcpkgs/sndio/files/sndiod/run
index 5f23cc89d83..8b4bb8dc004 100755
--- a/srcpkgs/sndio/files/sndiod/run
+++ b/srcpkgs/sndio/files/sndiod/run
@@ -1,2 +1,3 @@
 #!/bin/sh
-exec chpst -u sndiod:audio sndiod -L :: -d 2>&1
+[ -r conf ] && . ./conf
+exec sndiod ${OPTS} -d 2>&1
diff --git a/srcpkgs/sndio/template b/srcpkgs/sndio/template
index 2b15729aa32..abd2bd8a576 100644
--- a/srcpkgs/sndio/template
+++ b/srcpkgs/sndio/template
@@ -1,7 +1,7 @@
 # Template file for 'sndio'
 pkgname=sndio
 version=1.2.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr"
 makedepends="alsa-lib-devel"
@@ -10,6 +10,7 @@ maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="ISC"
 system_accounts="sndiod"
 sndiod_descr="sndio daemon"
+sndiod_pgroup="audio"
 homepage="http://www.sndio.org/"
 distfiles="http://www.sndio.org/${pkgname}-${version}.tar.gz"
 checksum=b9808e189481904a4404b0c1715ad0c4b301e72abca8e49653bb526ff4e16cdc
@@ -20,8 +21,14 @@ post_install() {
 	vlicense LICENSE
 }
 
+libsndio_package() {
+	short_desc+=" -- library"
+	pkg_install() {
+		vmove "usr/lib/libsndio.so.*"
+	}
+}
 sndio-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="libsndio>=${version}_${revision}"
 	short_desc+=" -- development files"
 	pkg_install() {
 		vmove usr/include