Wed Jul 6 10:02:14 2022 UTC ()
snapcast: /var/run is cleared on boot so needs to be created by the rc
script


(nia)
diff -r1.3 -r1.4 pkgsrc/audio/snapcast/Makefile
diff -r1.1 -r1.2 pkgsrc/audio/snapcast/files/snapclient.sh
diff -r1.1 -r1.2 pkgsrc/audio/snapcast/files/snapserver.sh
cvs diff -r1.3 -r1.4 pkgsrc/audio/snapcast/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/snapcast/Makefile 2022/07/03 17:32:04 1.3
+++ pkgsrc/audio/snapcast/Makefile 2022/07/06 10:02:13 1.4
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.3 2022/07/03 17:32:04 nia Exp $ 1# $NetBSD: Makefile,v 1.4 2022/07/06 10:02:13 nia Exp $
2 2
3DISTNAME= snapcast-0.26.0 3DISTNAME= snapcast-0.26.0
 4PKGREVISION= 1
4CATEGORIES= audio 5CATEGORIES= audio
5MASTER_SITES= ${MASTER_SITE_GITHUB:=badaix/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=badaix/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
7 8
8MAINTAINER= nia@NetBSD.org 9MAINTAINER= nia@NetBSD.org
9HOMEPAGE= https://github.com/badaix/snapcast 10HOMEPAGE= https://github.com/badaix/snapcast
10COMMENT= Multiroom client-server audio player 11COMMENT= Multiroom client-server audio player
11LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
12 13
13USE_CMAKE= yes 14USE_CMAKE= yes
14USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
15USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
16 17
@@ -38,40 +39,36 @@ RCD_SCRIPTS+= snapserver @@ -38,40 +39,36 @@ RCD_SCRIPTS+= snapserver
38 39
39SNAPCLIENT_USER?= snapclient 40SNAPCLIENT_USER?= snapclient
40SNAPCLIENT_GROUP?= snapclient 41SNAPCLIENT_GROUP?= snapclient
41 42
42SNAPSERVER_USER?= snapserver 43SNAPSERVER_USER?= snapserver
43SNAPSERVER_GROUP?= snapserver 44SNAPSERVER_GROUP?= snapserver
44 45
45BUILD_DEFS+= VARBASE 46BUILD_DEFS+= VARBASE
46 47
47.include "../../mk/bsd.prefs.mk" 48.include "../../mk/bsd.prefs.mk"
48 49
49FILES_SUBST+= SNAPCLIENT_USER=${SNAPCLIENT_USER} 50FILES_SUBST+= SNAPCLIENT_USER=${SNAPCLIENT_USER}
50FILES_SUBST+= SNAPCLIENT_GROUP=${SNAPCLIENT_GROUP} 51FILES_SUBST+= SNAPCLIENT_GROUP=${SNAPCLIENT_GROUP}
 52FILES_SUBST+= SNAPSERVER_USER=${SNAPSERVER_USER}
 53FILES_SUBST+= SNAPSERVER_GROUP=${SNAPSERVER_GROUP}
51FILES_SUBST+= VARBASE=${VARBASE} 54FILES_SUBST+= VARBASE=${VARBASE}
52 55
53PKG_GROUPS+= ${SNAPCLIENT_GROUP} 56PKG_GROUPS+= ${SNAPCLIENT_GROUP}
54PKG_GROUPS+= ${SNAPSERVER_GROUP} 57PKG_GROUPS+= ${SNAPSERVER_GROUP}
55 58
56PKG_USERS+= ${SNAPCLIENT_USER}:${SNAPCLIENT_GROUP} 59PKG_USERS+= ${SNAPCLIENT_USER}:${SNAPCLIENT_GROUP}
57PKG_USERS+= ${SNAPSERVER_USER}:${SNAPSERVER_GROUP} 60PKG_USERS+= ${SNAPSERVER_USER}:${SNAPSERVER_GROUP}
58 61
59OWN_DIRS_PERMS+= ${VARBASE}/run/snapclient \ 
60 ${SNAPCLIENT_USER} ${SNAPCLIENT_GROUP} 0755 
61 
62OWN_DIRS_PERMS+= ${VARBASE}/run/snapserver \ 
63 ${SNAPCLIENT_USER} ${SNAPCLIENT_GROUP} 0755 
64 
65OWN_DIRS_PERMS+= ${VARBASE}/lib/snapclient \ 62OWN_DIRS_PERMS+= ${VARBASE}/lib/snapclient \
66 ${SNAPSERVER_USER} ${SNAPSERVER_GROUP} 0755 63 ${SNAPSERVER_USER} ${SNAPSERVER_GROUP} 0755
67 64
68OWN_DIRS_PERMS+= ${VARBASE}/lib/snapserver \ 65OWN_DIRS_PERMS+= ${VARBASE}/lib/snapserver \
69 ${SNAPSERVER_USER} ${SNAPSERVER_GROUP} 0755 66 ${SNAPSERVER_USER} ${SNAPSERVER_GROUP} 0755
70 67
71post-install: 68post-install:
72 cd ${WRKSRC} && ${CHMOD} +r ${DESTDIR}${PREFIX}/share/snapserver/plug-ins/meta_mpd.py 69 cd ${WRKSRC} && ${CHMOD} +r ${DESTDIR}${PREFIX}/share/snapserver/plug-ins/meta_mpd.py
73 70
74.include "options.mk" 71.include "options.mk"
75.include "../../audio/flac/buildlink3.mk" 72.include "../../audio/flac/buildlink3.mk"
76.include "../../audio/libopus/buildlink3.mk" 73.include "../../audio/libopus/buildlink3.mk"
77.include "../../audio/libsoxr/buildlink3.mk" 74.include "../../audio/libsoxr/buildlink3.mk"
cvs diff -r1.1 -r1.2 pkgsrc/audio/snapcast/files/snapclient.sh (expand / switch to unified diff)

--- pkgsrc/audio/snapcast/files/snapclient.sh 2022/07/03 16:09:15 1.1
+++ pkgsrc/audio/snapcast/files/snapclient.sh 2022/07/06 10:02:14 1.2
@@ -1,23 +1,32 @@ @@ -1,23 +1,32 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: snapclient.sh,v 1.1 2022/07/03 16:09:15 nia Exp $ 3# $NetBSD: snapclient.sh,v 1.2 2022/07/06 10:02:14 nia Exp $
4# 4#
5# PROVIDE: snapclient 5# PROVIDE: snapclient
6# KEYWORD: shutdown 6# KEYWORD: shutdown
7# 7#
8 8
9if [ -f /etc/rc.subr ] 9if [ -f /etc/rc.subr ]
10then 10then
11 . /etc/rc.subr 11 . /etc/rc.subr
12fi 12fi
13 13
14name="snapclient" 14name="snapclient"
15rcvar=${name} 15rcvar=${name}
16command="@PREFIX@/bin/snapclient" 16command="@PREFIX@/bin/snapclient"
17command_args="-d" 17command_args="-d"
18pidfile="@VARBASE@/run/snapclient/pid" 18pidfile="@VARBASE@/run/snapclient/pid"
19snapclient_user=@SNAPCLIENT_USER@ 19snapclient_user="@SNAPCLIENT_USER@"
20snapclient_group=@SNAPCLIENT_GROUP@ 20snapclient_group="@SNAPCLIENT_GROUP@"
 21start_precmd="snapclient_precmd"
 22
 23snapclient_precmd()
 24{
 25 if [ ! -d "@VARBASE@/run/snapclient" ]; then
 26 mkdir -p -m 755 "@VARBASE@/run/snapclient"
 27 chown @SNAPCLIENT_USER@:@SNAPCLIENT_GROUP@ "@VARBASE@/run/snapclient"
 28 fi
 29}
21 30
22load_rc_config $name 31load_rc_config $name
23run_rc_command "$1" 32run_rc_command "$1"
cvs diff -r1.1 -r1.2 pkgsrc/audio/snapcast/files/snapserver.sh (expand / switch to unified diff)

--- pkgsrc/audio/snapcast/files/snapserver.sh 2022/07/03 16:09:15 1.1
+++ pkgsrc/audio/snapcast/files/snapserver.sh 2022/07/06 10:02:14 1.2
@@ -1,21 +1,30 @@ @@ -1,21 +1,30 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: snapserver.sh,v 1.1 2022/07/03 16:09:15 nia Exp $ 3# $NetBSD: snapserver.sh,v 1.2 2022/07/06 10:02:14 nia Exp $
4# 4#
5# PROVIDE: snapserver 5# PROVIDE: snapserver
6# KEYWORD: shutdown 6# KEYWORD: shutdown
7# 7#
8 8
9if [ -f /etc/rc.subr ] 9if [ -f /etc/rc.subr ]
10then 10then
11 . /etc/rc.subr 11 . /etc/rc.subr
12fi 12fi
13 13
14name="snapserver" 14name="snapserver"
15rcvar=${name} 15rcvar=${name}
16command="@PREFIX@/bin/snapserver" 16command="@PREFIX@/bin/snapserver"
17command_args="-d" 17command_args="-d"
18pidfile="@VARBASE@/run/snapserver/pid" 18pidfile="@VARBASE@/run/snapserver/pid"
 19start_precmd="snapserver_precmd"
 20
 21snapserver_precmd()
 22{
 23 if [ ! -d "@VARBASE@/run/snapserver" ]; then
 24 mkdir -p -m 755 "@VARBASE@/run/snapserver"
 25 chown @SNAPSERVER_USER@:@SNAPSERVER_GROUP@ "@VARBASE@/run/snapserver"
 26 fi
 27}
19 28
20load_rc_config $name 29load_rc_config $name
21run_rc_command "$1" 30run_rc_command "$1"