From owner-dev-commits-ports-all@freebsd.org Fri Jul 2 19:36:08 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C0E336718C2; Fri, 2 Jul 2021 19:36:08 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GGlgX4xhVz3hyk; Fri, 2 Jul 2021 19:36:08 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9162E19ACC; Fri, 2 Jul 2021 19:36:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 162Ja89o011491; Fri, 2 Jul 2021 19:36:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 162Ja8Dt011490; Fri, 2 Jul 2021 19:36:08 GMT (envelope-from git) Date: Fri, 2 Jul 2021 19:36:08 GMT Message-Id: <202107021936.162Ja8Dt011490@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 9ccea4316ab0 - main - ausio/zita-njbridge: New port: Command line client to transmit audio over a local IP network MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ccea4316ab0b57a46b9070299a0ff6220274316 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jul 2021 19:36:08 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=9ccea4316ab0b57a46b9070299a0ff6220274316 commit 9ccea4316ab0b57a46b9070299a0ff6220274316 Author: Yuri Victorovich AuthorDate: 2021-07-02 19:35:19 +0000 Commit: Yuri Victorovich CommitDate: 2021-07-02 19:36:06 +0000 ausio/zita-njbridge: New port: Command line client to transmit audio over a local IP network --- audio/Makefile | 1 + audio/zita-njbridge/Makefile | 33 +++++++++++++++++++++++++++++ audio/zita-njbridge/YURI | 1 + audio/zita-njbridge/distinfo | 3 +++ audio/zita-njbridge/files/patch-netdata.cc | 11 ++++++++++ audio/zita-njbridge/files/patch-pxthread.cc | 11 ++++++++++ audio/zita-njbridge/files/patch-pxthread.h | 20 +++++++++++++++++ audio/zita-njbridge/files/patch-zita-j2n.cc | 10 +++++++++ audio/zita-njbridge/files/patch-zita-n2j.cc | 10 +++++++++ audio/zita-njbridge/files/patch-zsockets.cc | 20 +++++++++++++++++ audio/zita-njbridge/files/patch-zsockets.h | 10 +++++++++ audio/zita-njbridge/pkg-descr | 11 ++++++++++ 12 files changed, 141 insertions(+) diff --git a/audio/Makefile b/audio/Makefile index 4a3716affc3f..f56d1f60d3d5 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -870,6 +870,7 @@ SUBDIR += yoshimi SUBDIR += zam-plugins-lv2 SUBDIR += zita-convolver + SUBDIR += zita-njbridge SUBDIR += zita-resampler SUBDIR += zrythm SUBDIR += zynaddsubfx diff --git a/audio/zita-njbridge/Makefile b/audio/zita-njbridge/Makefile new file mode 100644 index 000000000000..2eb0dd6e98d8 --- /dev/null +++ b/audio/zita-njbridge/Makefile @@ -0,0 +1,33 @@ +PORTNAME= zita-njbridge +DISTVERSION= 0.4.8 +CATEGORIES= audio +MASTER_SITES= https://kokkinizita.linuxaudio.org/linuxaudio/downloads/ + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Command line client to transmit audio over a local IP network + +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/../COPYING + +LIB_DEPENDS= libjack.so:audio/jack \ + libzita-resampler.so:audio/zita-resampler + +USES= gmake localbase:ldflags tar:bzip2 +USE_LDCONFIG= yes + +WRKSRC_SUBDIR= source + +MAKE_ARGS= MANDIR=${PREFIX}/man/man1 + +PLIST_FILES= bin/zita-j2n \ + bin/zita-n2j \ + man/man1/zita-j2n.1.gz \ + man/man1/zita-n2j.1.gz \ + man/man1/zita-njbridge.1.gz + +post-install: + @${STRIP_CMD} \ + ${STAGEDIR}${PREFIX}/bin/zita-j2n \ + ${STAGEDIR}${PREFIX}/bin/zita-n2j + +.include diff --git a/audio/zita-njbridge/YURI b/audio/zita-njbridge/YURI new file mode 100644 index 000000000000..7aee3032f757 --- /dev/null +++ b/audio/zita-njbridge/YURI @@ -0,0 +1 @@ +Needs IPV6_ADD_MEMBERSHIP diff --git a/audio/zita-njbridge/distinfo b/audio/zita-njbridge/distinfo new file mode 100644 index 000000000000..879f068cd588 --- /dev/null +++ b/audio/zita-njbridge/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1625242627 +SHA256 (zita-njbridge-0.4.8.tar.bz2) = 101176a0bd407cab7bffd326e8d6886c1b65b212bc33f2efb97b03f926c47907 +SIZE (zita-njbridge-0.4.8.tar.bz2) = 33948 diff --git a/audio/zita-njbridge/files/patch-netdata.cc b/audio/zita-njbridge/files/patch-netdata.cc new file mode 100644 index 000000000000..0869abff2abb --- /dev/null +++ b/audio/zita-njbridge/files/patch-netdata.cc @@ -0,0 +1,11 @@ +--- netdata.cc.orig 2021-07-02 16:20:01 UTC ++++ netdata.cc +@@ -18,7 +18,7 @@ + // ---------------------------------------------------------------------------- + + +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__FreeBSD__) + #include + #else + #include diff --git a/audio/zita-njbridge/files/patch-pxthread.cc b/audio/zita-njbridge/files/patch-pxthread.cc new file mode 100644 index 000000000000..d9f7f600db95 --- /dev/null +++ b/audio/zita-njbridge/files/patch-pxthread.cc @@ -0,0 +1,11 @@ +--- pxthread.cc.orig 2021-07-02 16:43:47 UTC ++++ pxthread.cc +@@ -25,7 +25,7 @@ + // ---------------------------------------------------------------------------- + + +-#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(__APPLE__) ++#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(__APPLE__) || defined(__FreeBSD__) + + + Pxthread::Pxthread (void) diff --git a/audio/zita-njbridge/files/patch-pxthread.h b/audio/zita-njbridge/files/patch-pxthread.h new file mode 100644 index 000000000000..6e61c92e5db3 --- /dev/null +++ b/audio/zita-njbridge/files/patch-pxthread.h @@ -0,0 +1,20 @@ +--- pxthread.h.orig 2021-07-02 16:38:46 UTC ++++ pxthread.h +@@ -25,7 +25,7 @@ + // ---------------------------------------------------------------------------- + + +-#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(__APPLE__) ++#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(__APPLE__) || defined(__FreeBSD__) + + // NOTE: __FreeBSD_kernel__ and __GNU__ were added by the Debian maintainers + // (the latter for the HURD version of Debian). Things are reported to work +@@ -61,7 +61,7 @@ class Pxthread (private) + // ---------------------------------------------------------------------------- + + +-#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__) ++#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__) + + class Pxsema + { diff --git a/audio/zita-njbridge/files/patch-zita-j2n.cc b/audio/zita-njbridge/files/patch-zita-j2n.cc new file mode 100644 index 000000000000..bdeb6c98fb5d --- /dev/null +++ b/audio/zita-njbridge/files/patch-zita-j2n.cc @@ -0,0 +1,10 @@ +--- zita-j2n.cc.orig 2021-07-02 16:35:56 UTC ++++ zita-j2n.cc +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include // for usleep + #include "jacktx.h" + #include "nettx.h" + #include "lfqueue.h" diff --git a/audio/zita-njbridge/files/patch-zita-n2j.cc b/audio/zita-njbridge/files/patch-zita-n2j.cc new file mode 100644 index 000000000000..29eaad82cd2a --- /dev/null +++ b/audio/zita-njbridge/files/patch-zita-n2j.cc @@ -0,0 +1,10 @@ +--- zita-n2j.cc.orig 2021-07-02 16:38:01 UTC ++++ zita-n2j.cc +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include "lfqueue.h" + #include "netdata.h" + #include "zsockets.h" diff --git a/audio/zita-njbridge/files/patch-zsockets.cc b/audio/zita-njbridge/files/patch-zsockets.cc new file mode 100644 index 000000000000..e30ceda228cd --- /dev/null +++ b/audio/zita-njbridge/files/patch-zsockets.cc @@ -0,0 +1,20 @@ +--- zsockets.cc.orig 2020-03-17 09:49:07 UTC ++++ zsockets.cc +@@ -27,7 +27,7 @@ + #include + #include + #include +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__FreeBSD__) + #include + #endif + #include +@@ -408,7 +408,7 @@ int sock_open_mcrecv (Sockaddr *addr, const char *ifac + } + memcpy (&mcreq.ipv6mr_multiaddr, &(A6->sin6_addr), sizeof(struct in6_addr)); + mcreq.ipv6mr_interface = if_nametoindex (iface); +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__FreeBSD__) + if (setsockopt (fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, (char*) &mcreq, sizeof (mcreq))) + #else + if (setsockopt (fd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, (char*) &mcreq, sizeof (mcreq))) diff --git a/audio/zita-njbridge/files/patch-zsockets.h b/audio/zita-njbridge/files/patch-zsockets.h new file mode 100644 index 000000000000..a14632259111 --- /dev/null +++ b/audio/zita-njbridge/files/patch-zsockets.h @@ -0,0 +1,10 @@ +--- zsockets.h.orig 2021-07-02 16:22:01 UTC ++++ zsockets.h +@@ -23,6 +23,7 @@ + + + #include ++#include + #include + + diff --git a/audio/zita-njbridge/pkg-descr b/audio/zita-njbridge/pkg-descr new file mode 100644 index 000000000000..8a529bfc2c17 --- /dev/null +++ b/audio/zita-njbridge/pkg-descr @@ -0,0 +1,11 @@ +Command line Jack clients to transmit full quality multichannel audio over a +local IP network, with adaptive resampling by the receiver(s). Zita-njbridge can +be used for a one-to-one connection (using UDP) or in a one-to-many system +(using multicast). Sender and receiver(s) can each have their own sample rate +and period size, and no word clock sync between them is assumed. Up 64 channels +can be transmitted, receivers can select any combination of these. On a lightly +loaded or dedicated network zita-njbridge can provide low latency (same as for +an analog connection). Additional buffering can be specified in case there is +significant network delay jitter. IPv6 is fully supported. + +WWW: https://kokkinizita.linuxaudio.org/linuxaudio/