| 1 |
commit: 70e12bfc0e59eb6b24288987a323ab18581dca91 |
| 2 |
Author: Christian Buchinger <cb-gentoo <AT> guya <DOT> de> |
| 3 |
AuthorDate: Tue Oct 23 16:49:07 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 26 12:25:11 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70e12bfc |
| 7 |
|
| 8 |
media-sound/snapcast: Minor fixes |
| 9 |
|
| 10 |
* Forcing -d(aemon) by moving it from confd to initd |
| 11 |
* Dropped global USE flag descriptions |
| 12 |
* Removed CMakeList patch because upstream merged it |
| 13 |
|
| 14 |
Signed-off-by: Christian Buchinger <cb-gentoo <AT> guya.de> |
| 15 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/10207 |
| 17 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 18 |
|
| 19 |
media-sound/snapcast/files/snapclient.confd | 2 +- |
| 20 |
media-sound/snapcast/files/snapclient.initd | 2 +- |
| 21 |
media-sound/snapcast/files/snapserver.confd | 2 +- |
| 22 |
media-sound/snapcast/files/snapserver.initd | 2 +- |
| 23 |
media-sound/snapcast/metadata.xml | 3 --- |
| 24 |
.../snapcast/{snapcast-0.15.0.ebuild => snapcast-0.15.0-r1.ebuild} | 0 |
| 25 |
media-sound/snapcast/snapcast-9999.ebuild | 2 -- |
| 26 |
7 files changed, 4 insertions(+), 9 deletions(-) |
| 27 |
|
| 28 |
diff --git a/media-sound/snapcast/files/snapclient.confd b/media-sound/snapcast/files/snapclient.confd |
| 29 |
index 311cce1c4fa..e636d74da2b 100644 |
| 30 |
--- a/media-sound/snapcast/files/snapclient.confd |
| 31 |
+++ b/media-sound/snapcast/files/snapclient.confd |
| 32 |
@@ -30,4 +30,4 @@ |
| 33 |
|
| 34 |
SNAPCLIENT_USER="--user snapclient:audio" |
| 35 |
|
| 36 |
-SNAPCLIENT_OPTS="-d" |
| 37 |
+SNAPCLIENT_OPTS="" |
| 38 |
|
| 39 |
diff --git a/media-sound/snapcast/files/snapclient.initd b/media-sound/snapcast/files/snapclient.initd |
| 40 |
index df69eb2621a..45c0c74316d 100644 |
| 41 |
--- a/media-sound/snapcast/files/snapclient.initd |
| 42 |
+++ b/media-sound/snapcast/files/snapclient.initd |
| 43 |
@@ -4,7 +4,7 @@ |
| 44 |
|
| 45 |
name=snapclient |
| 46 |
command="/usr/bin/snapclient" |
| 47 |
-command_args="$SNAPCLIENT_USER $SNAPCLIENT_OPTS" |
| 48 |
+command_args="-d $SNAPCLIENT_USER $SNAPCLIENT_OPTS" |
| 49 |
pidfile="/run/snapclient/pid" |
| 50 |
|
| 51 |
depend() { |
| 52 |
|
| 53 |
diff --git a/media-sound/snapcast/files/snapserver.confd b/media-sound/snapcast/files/snapserver.confd |
| 54 |
index 9b12f81ff2a..8a4327a79b9 100644 |
| 55 |
--- a/media-sound/snapcast/files/snapserver.confd |
| 56 |
+++ b/media-sound/snapcast/files/snapserver.confd |
| 57 |
@@ -42,4 +42,4 @@ |
| 58 |
|
| 59 |
SNAPSERVER_USER="--user snapserver:snapserver" |
| 60 |
|
| 61 |
-SNAPSERVER_OPTS="-d -s pipe:///tmp/snapfifo?name=default" |
| 62 |
+SNAPSERVER_OPTS="-s pipe:///tmp/snapfifo?name=default" |
| 63 |
|
| 64 |
diff --git a/media-sound/snapcast/files/snapserver.initd b/media-sound/snapcast/files/snapserver.initd |
| 65 |
index 02762c861b0..220e7228eeb 100644 |
| 66 |
--- a/media-sound/snapcast/files/snapserver.initd |
| 67 |
+++ b/media-sound/snapcast/files/snapserver.initd |
| 68 |
@@ -4,7 +4,7 @@ |
| 69 |
|
| 70 |
name=snapserver |
| 71 |
command="/usr/bin/snapserver" |
| 72 |
-command_args="$SNAPSERVER_USER $SNAPSERVER_OPTS" |
| 73 |
+command_args="-d $SNAPSERVER_USER $SNAPSERVER_OPTS" |
| 74 |
pidfile="/run/snapserver/pid" |
| 75 |
|
| 76 |
depend() { |
| 77 |
|
| 78 |
diff --git a/media-sound/snapcast/metadata.xml b/media-sound/snapcast/metadata.xml |
| 79 |
index 3a92671f333..cf204c8ac11 100644 |
| 80 |
--- a/media-sound/snapcast/metadata.xml |
| 81 |
+++ b/media-sound/snapcast/metadata.xml |
| 82 |
@@ -10,12 +10,9 @@ |
| 83 |
<name>Proxy Maintainers</name> |
| 84 |
</maintainer> |
| 85 |
<use> |
| 86 |
- <flag name="avahi">Build with avahi support</flag> |
| 87 |
<flag name="client">Build and install Snapcast client component</flag> |
| 88 |
- <flag name="flac">Build with FLAC compression support</flag> |
| 89 |
<flag name="server">Build and install Snapcast server component</flag> |
| 90 |
<flag name="tremor">Build with TREMOR version of vorbis</flag> |
| 91 |
- <flag name="vorbis">Build with libvorbis support</flag> |
| 92 |
</use> |
| 93 |
<upstream> |
| 94 |
<maintainer status="active"> |
| 95 |
|
| 96 |
diff --git a/media-sound/snapcast/snapcast-0.15.0.ebuild b/media-sound/snapcast/snapcast-0.15.0-r1.ebuild |
| 97 |
similarity index 100% |
| 98 |
rename from media-sound/snapcast/snapcast-0.15.0.ebuild |
| 99 |
rename to media-sound/snapcast/snapcast-0.15.0-r1.ebuild |
| 100 |
|
| 101 |
diff --git a/media-sound/snapcast/snapcast-9999.ebuild b/media-sound/snapcast/snapcast-9999.ebuild |
| 102 |
index a664ea01e29..6bfe033cdb5 100644 |
| 103 |
--- a/media-sound/snapcast/snapcast-9999.ebuild |
| 104 |
+++ b/media-sound/snapcast/snapcast-9999.ebuild |
| 105 |
@@ -35,8 +35,6 @@ DEPEND="${RDEPEND} |
| 106 |
>=dev-cpp/asio-1.12.1 |
| 107 |
>=dev-cpp/popl-1.2.0" |
| 108 |
|
| 109 |
-PATCHES=( "${FILESDIR}/${PN}-options-for-use-flags.patch" ) |
| 110 |
- |
| 111 |
pkg_setup() { |
| 112 |
if use server ; then |
| 113 |
enewgroup "snapserver" |
Archives