Attachment 220321 Details for Bug 251125 – Fix port, always build jackd with rc service

[patch] Fix port, always build jackd with rc service

port.diff (text/plain), 2.74 KB, created by Florian Walpen on 2020-12-06 18:13:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Walpen

Created: 2020-12-06 18:13:09 UTC

Size: 2.74 KB

patch

obsolete

>diff -r -u -N audio/jack/Makefile /usr/ports/audio/jack/Makefile
>--- audio/jack/Makefile	2020-12-06 14:37:11.470940000 +0100
>+++ /usr/ports/audio/jack/Makefile	2020-12-06 18:36:39.509511000 +0100
>@@ -14,6 +14,7 @@
> 
> LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
> 		libsamplerate.so:audio/libsamplerate \
>+		libsysinfo.so:devel/libsysinfo \
> 		libcelt0.so:audio/celt
> 
> USES=		waf compiler:c11 pkgconfig shebangfix python:3.4+,build
>@@ -28,6 +29,7 @@
> 
> SHEBANG_FILES=	tools/jack_control
> SHEBANG_LANG=	python3
>+USE_RC_SUBR=	jackd
> 
> CONFIGURE_ARGS+=	--celt=yes --sndfile=yes --samplerate=yes
> 
>@@ -39,9 +41,8 @@
> ALSA_CONFIGURE_OFF=	--alsa=no
> ALSA_CONFIGURE_ON=	--alsa=yes
> 
>-DBUS_CONFIGURE_ON=	--dbus
>+DBUS_CONFIGURE_ON=	--dbus --classic --autostart=dbus
> DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus \
>-			libsysinfo.so:devel/libsysinfo \
> 			libexpat.so:textproc/expat2
> DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
> 
>diff -r -u -N audio/jack/files/jackd.in /usr/ports/audio/jack/files/jackd.in
>--- audio/jack/files/jackd.in	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/audio/jack/files/jackd.in	2020-12-06 17:47:00.890200000 +0100
>@@ -0,0 +1,37 @@
>+#!/bin/sh
>+#
>+# $FreeBSD: head/audio/jack/files/jackd.in 472147 2018-06-10 17:11:05Z riggs $
>+#
>+# PROVIDE: jackd
>+# REQUIRE: LOGIN
>+#
>+# Add the following line to /etc/rc.conf to enable jackd:
>+#
>+# jackd_enable="YES"
>+#
>+
>+: ${jackd_enable="NO"}
>+: ${jackd_user="root"}
>+: ${jackd_rtprio="NO"}
>+: ${jackd_args="-r -doss -r44100 -p1024 -n3 -w16"}
>+
>+. /etc/rc.subr
>+
>+name=jackd
>+rcvar=jackd_enable
>+procname=%%PREFIX%%/bin/jackd
>+start_cmd="start_jackd"
>+
>+start_jackd() {
>+  echo "Starting ${name}."
>+  if [ $jackd_rtprio = "YES" ]; then
>+    local rt="rtprio 1"
>+  fi
>+  # log the date and parameters
>+  echo -e "\n[`date`] Starting the daemon, user=$jackd_user rtprio=$jackd_rtprio args=\"$jackd_args\"" >> /var/log/${name}.log
>+  # daemon(8) should be able to set the realtime priority, but it isn't
>+  $rt daemon -p /var/run/${name}.pid -u "${jackd_user}" %%PREFIX%%/bin/jackd ${jackd_args}
>+}
>+
>+load_rc_config ${name}
>+run_rc_command "$1"
>diff -r -u -N audio/jack/pkg-plist /usr/ports/audio/jack/pkg-plist
>--- audio/jack/pkg-plist	2020-12-06 14:54:36.028124000 +0100
>+++ /usr/ports/audio/jack/pkg-plist	2020-12-06 16:13:31.884336000 +0100
>@@ -35,7 +35,8 @@
> bin/jack_unload
> bin/jack_wait
> bin/jack_zombie
>-bin/jackdbus
>+bin/jackd
>+%%DBUS%%bin/jackdbus
> include/jack/control.h
> include/jack/intclient.h
> include/jack/jack.h
>@@ -75,7 +76,7 @@
> lib/libjackserver.so.0
> lib/libjackserver.so.0.1.0
> libdata/pkgconfig/jack.pc
>-share/dbus-1/services/org.jackaudio.service
>+%%DBUS%%share/dbus-1/services/org.jackaudio.service
> share/man/man1/alsa_in.1.gz
> share/man/man1/alsa_out.1.gz
> share/man/man1/jack_bufsize.1.gz

Actions: View | Diff

Attachments on bug 251125: 219927 | 219928 | 219959 | 219960 | 220031 | 220062 | 220087 | 220102 | 220197 | 220234 | 220276 | 220277 | 220289 | 220316 | 220321 | 220352 | 220399 | 220400 | 220514 | 223542 | 226856 | 226860