git: 183213847e99 - main - audio/jack: Option for new OSS driver backend

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=183213847e99429b8b297db54029fd9e80741ced

commit 183213847e99429b8b297db54029fd9e80741ced
Author:     Florian Walpen <dev@submerge.ch>
AuthorDate: 2024-08-06 14:53:06 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-08-06 14:53:06 +0000

    audio/jack: Option for new OSS driver backend
    
    Add a non-default option to build the new OSS driver backend coming in
    the next JACK release. The backend is a complete rewrite based on the
    sosso library, with improved stability and low latency capabilities. Let
    users preview and test the new backend before it becomes default.
    Builds with default options are not affected, thus no PORTREVISION bump.
    
    While here, cleanup two checks in the RC service script, one of them
    deprecated, the other was ineffective by mistake.
    
    PR:     280611
---
 audio/jack/Makefile       | 9 +++++++--
 audio/jack/distinfo       | 4 +++-
 audio/jack/files/jackd.in | 6 ++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index b0f34b0f5572..ce432acbef53 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -30,8 +30,8 @@ SHEBANG_LANG=	python3
 
 CONFIGURE_ARGS=	--celt=no --samplerate=yes
 
-OPTIONS_DEFINE=		ALSA DBUS OPUS PROFILING
-OPTIONS_DEFAULT=	DBUS OPUS
+OPTIONS_DEFINE=		ALSA DBUS OPUS PROFILING SOSSO
+OPTIONS_DEFAULT=	DBUS OPUS  SOSSO
 OPTIONS_SUB=		yes
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
@@ -50,6 +50,11 @@ OPUS_CONFIGURE_OFF=	--opus=no
 PROFILING_DESC=		Build with profiling information
 PROFILING_CONFIGURE_ON=	--profile
 
+# Let users test the new OSS driver backend coming in 1.9.23, see
+# https://github.com/jackaudio/jack2/pull/943
+SOSSO_DESC=		Build new OSS driver backend (sosso library)
+SOSSO_GH_TAGNAME=	0762eac06a8c327757acfa7c770e16d827610873
+
 TESTING_UNSAFE=	No function 'test' defined in ${WRKSRC}/wscript
 
 .include <bsd.port.pre.mk>
diff --git a/audio/jack/distinfo b/audio/jack/distinfo
index 4d372a443879..3b177ebf1c1e 100644
--- a/audio/jack/distinfo
+++ b/audio/jack/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1675342810
+TIMESTAMP = 1722598892
 SHA256 (jackaudio-jack2-v1.9.22_GH0.tar.gz) = 1e42b9fc4ad7db7befd414d45ab2f8a159c0b30fcd6eee452be662298766a849
 SIZE (jackaudio-jack2-v1.9.22_GH0.tar.gz) = 933448
+SHA256 (jackaudio-jack2-v1.9.22-0762eac06a8c327757acfa7c770e16d827610873_GH0.tar.gz) = d6207cfb28f5d8e3531d5a283a80631b94b3e633b9f51edecdf5d112e979a3e3
+SIZE (jackaudio-jack2-v1.9.22-0762eac06a8c327757acfa7c770e16d827610873_GH0.tar.gz) = 967723
diff --git a/audio/jack/files/jackd.in b/audio/jack/files/jackd.in
index e78285044ea7..8f8d617fe377 100644
--- a/audio/jack/files/jackd.in
+++ b/audio/jack/files/jackd.in
@@ -9,8 +9,7 @@
 #
 
 : ${jackd_enable="NO"}
-: ${jackd_user="root"}
-: ${jackd_rtprio="NO"}
+: ${jackd_user=""}
 : ${jackd_args="--no-realtime -doss -r48000 -p1024 -w32"}
 
 . /etc/rc.subr
@@ -32,8 +31,7 @@ check_config() {
   fi
 
   # detect intent to use realtime priority
-  if [ "$jackd_rtprio" = "YES" ] || \
-     { echo "$jackd_args" | grep -q -- "oss" && \
+  if { echo "$jackd_args" | grep -q -- "oss" && \
        { echo "$jackd_args" | grep -qw -- "--realtime"  || \
          echo "$jackd_args" | grep -qw -- "-[A-Za-mo-z]*R[A-Za-z]*"; }; }; then
     # check that mac_priority(4) is enabled