From nobody Tue Aug 06 14:55:14 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WdbvQ3ClBz5S5BL; Tue, 06 Aug 2024 14:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WdbvQ2ZYrz4r2k; Tue, 6 Aug 2024 14:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722956114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1lD5aZyVkUt9sOOrZRfb3jJ9IqNEJDXnLmgXiow9ks0=; b=TnTuAlX1+ZiZuehJJP0/irFwxROUhHVc1MUO8kkwyos8OwBRbQ976L72NgbWK+V6hpShIy VZZkEotOI+Of7l/WRGHZB8pIo8ud1VLMuZGshFWfe6b3ld5nxkQsGIMjk3Ah5JH1TOfmGV W9oKaADi5Ac5TyBIz02ucv7rdNcq6aYcmFN1ITqC/2r4zctIWUxI06MAGvcLlWWQv4Sx0F rc8ctyJDteqy2Jc5VpUBeH+sPcyt/D8t3JREoKK+KVlsotXSsXuEzSc1yLldtH6jeznv6b fUjDlYD+MlSL5UPCg0oIRpChBc5H9c3uGBVMJ3hzt8N9a4z85kZpFLjuiNjkjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722956114; a=rsa-sha256; cv=none; b=fLVUd5+QMJNoTbRoXviZMow+9S6QYIU1cLkGUgthFMBghjuV/ocxEsyhVE2/9/GYQRolrZ 0ivT3mb2zn8TSUiklD6g7KOGs83l1sxBFeUaDLLvRWEaetfIosTXg3YoAkXGC8pEwC09Ul ta9S5qXnh83slbO+zITQGv/YuGSYA4Vsz3kZjFLxoctxU1o81fq4M1jvagFS3LOxRR7zBU Ysh5CF9RtZ+lNzAQeYq1H6as7Qad4pByT9cth3WiUQROrG+NNYWlpNLob2wp5ZNcavx46Q MHuIl8g6qeRHyU0/4sbQRF/9cjUDB/r+V/A+60oWn4ToN0aeBKA0UIU0RUSCVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722956114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1lD5aZyVkUt9sOOrZRfb3jJ9IqNEJDXnLmgXiow9ks0=; b=GW0hrxTOpv5Scqg6M5lFreir2URD5fF3APq0zT2buEpz8jA8zk2S7reFy8i9hmHuJ4hvtT mnlmJRyVNpc/THSfBKf3XcWgc9DKiM0U3aqBdq1EAgFILSqkj7fuiqSudxzly91lmEurnu vrsLyNV7WdM4OnX2mSmgyGKMQK4nBDuiITvY1k7kjAc5AuQeYWTkFY3rEoqZu0oWV0ZFXD FB6ER0aIdB5UJ4o9HvRPgfCcD9KisIu+chO+VJVGAbwZwEGDI8TyFHT6Zc1qFim1O3DI6g fI9icrkONcr2yyo5wrfor1OOQeDwY0KF8jg2scTlQP9uVY6O+fuWzpCh8Ahn2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WdbvQ1zmbz1BCr; Tue, 6 Aug 2024 14:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 476EtEIW003868; Tue, 6 Aug 2024 14:55:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 476EtEMi003865; Tue, 6 Aug 2024 14:55:14 GMT (envelope-from git) Date: Tue, 6 Aug 2024 14:55:14 GMT Message-Id: <202408061455.476EtEMi003865@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 183213847e99 - main - audio/jack: Option for new OSS driver backend List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 183213847e99429b8b297db54029fd9e80741ced Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=183213847e99429b8b297db54029fd9e80741ced commit 183213847e99429b8b297db54029fd9e80741ced Author: Florian Walpen AuthorDate: 2024-08-06 14:53:06 +0000 Commit: Vladimir Druzenko 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 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