Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: media-sound/aucatctl/, media-sound/sndio/, media-sound/sndio/files/
Date: Thu, 28 May 2020 11:06:15
Message-Id: 1590624751.f3ca340a5494b8afdbd36d0a6af6be5de29b6c22.andrewammerlaan@gentoo
1 commit: f3ca340a5494b8afdbd36d0a6af6be5de29b6c22
2 Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
3 AuthorDate: Wed May 27 23:58:14 2020 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
5 CommitDate: Thu May 28 00:12:31 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f3ca340a
7
8 media-sound/*: Backport changes done for ::gentoo
9
10 Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
11
12 media-sound/aucatctl/aucatctl-0.1.ebuild | 2 +-
13 media-sound/sndio/files/sndiod | 3 +++
14 media-sound/sndio/sndio-1.6.0.ebuild | 14 ++++++++++----
15 3 files changed, 14 insertions(+), 5 deletions(-)
16
17 diff --git a/media-sound/aucatctl/aucatctl-0.1.ebuild b/media-sound/aucatctl/aucatctl-0.1.ebuild
18 index 5a71f43..bd13fc5 100644
19 --- a/media-sound/aucatctl/aucatctl-0.1.ebuild
20 +++ b/media-sound/aucatctl/aucatctl-0.1.ebuild
21 @@ -12,7 +12,7 @@ KEYWORDS="~amd64"
22
23 DEPEND="
24 dev-libs/libbsd
25 - media-sound/sndio
26 + media-sound/sndio:=
27 "
28 RDEPEND="${DEPEND}"
29
30
31 diff --git a/media-sound/sndio/files/sndiod b/media-sound/sndio/files/sndiod
32 new file mode 100644
33 index 0000000..ee38dcb
34 --- /dev/null
35 +++ b/media-sound/sndio/files/sndiod
36 @@ -0,0 +1,3 @@
37 +#!/sbin/openrc-run
38 +command="sndiod"
39 +command_user="sndiod"
40
41 diff --git a/media-sound/sndio/sndio-1.6.0.ebuild b/media-sound/sndio/sndio-1.6.0.ebuild
42 index 67deea4..02deebf 100644
43 --- a/media-sound/sndio/sndio-1.6.0.ebuild
44 +++ b/media-sound/sndio/sndio-1.6.0.ebuild
45 @@ -15,7 +15,7 @@ IUSE="alsa"
46
47 DEPEND="
48 dev-libs/libbsd[${MULTILIB_USEDEP}]
49 - media-libs/alsa-lib[${MULTILIB_USEDEP}]
50 + alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
51 "
52 RDEPEND="
53 ${DEPEND}
54 @@ -31,7 +31,13 @@ multilib_src_configure() {
55 ./configure \
56 --prefix=/usr \
57 --libdir=/usr/$(get_libdir) \
58 - --privsep-user=${PN}d \
59 - --enable-alsa \
60 - --with-libbsd
61 + --privsep-user=sndiod \
62 + --with-libbsd \
63 + $(use_enable alsa)
64 +}
65 +
66 +src_install() {
67 + multilib_src_install
68 +
69 + doinitd "${FILESDIR}/sndiod"
70 }