From nobody Sat Jun 25 04:42:15 2022 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 1523B85A7DA; Sat, 25 Jun 2022 04:42:16 +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 4LVLtv6c2kz4XWN; Sat, 25 Jun 2022 04:42:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656132135; 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=M/YTc4e97BLWcGPnsEV/xJ2/45RIx2ubX3fXB2peUjs=; b=czRyjWmU0t5Tm9lihkEcyyBT7p850hBcbmU0QqiQjtqigqTpT5bNCylXhKpUYc+Pjms5f7 RYHrW1rHPkTcQqOcUXtVG8wT92bsXdM34jQTrS1xBpXUgIB92YJMuhxMNHXsCiGpgZPAhT uchqt+6Hw/FNCGLiE95uVOVm8o1Lxe2oJyyLf7VCiTNHaRPd3tt1tYIWQvN+3KGxRlbIJP wNsL6+m5lR5+lecCECZd8XRQG1PpItxPLuuFvacOQzR0759gcZKszYzyj5Uf+J1tFjXB70 AgeHxa41EgsSipJvSgWfZoYq28CJM1mYlKfPfvOngZHKiQj0y6LIBUHiFgFzjg== 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 C44C11E0D0; Sat, 25 Jun 2022 04:42:15 +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 25P4gFZA032809; Sat, 25 Jun 2022 04:42:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25P4gF0G032808; Sat, 25 Jun 2022 04:42:15 GMT (envelope-from git) Date: Sat, 25 Jun 2022 04:42:15 GMT Message-Id: <202206250442.25P4gF0G032808@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: f5d638d08582 - main - audio/jacktrip: Update 1.6.0 -> 1.6.1 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org 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: f5d638d085822b935b91aaa1fcbfa0b0f79a9434 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656132135; 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=M/YTc4e97BLWcGPnsEV/xJ2/45RIx2ubX3fXB2peUjs=; b=mkc5NoyoO5e8zf/nsxIpJwAywSee3nxw8Smpwa4JNVlNi2XeUtBx6zPtErm1B8qLMTj8Q3 /46WEi++wAVDJBOmY8tSQNok7DkYYBDtUr7XFiUuGzmK8VBuliZDmklPVj4YzjKtpRzF4r eaP9cJbQYASH7VKC8Tr9BD5DBmKwit0NtDjuAD5vhFhowCiEskvJBJjvc2L7SR4RrI4Knr JQxOPHRl0A8Bybw0mHayDd1Nv+X3W7iJqAKQ53jSetGCMKL3EPMMKgCbgMpcrzglof2I9B TaaeU99dr/NtLbSjPz//gXLXf1LnJ/hyZ7n1p/FeLk+MVXqTr3GnOAPFScur6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656132135; a=rsa-sha256; cv=none; b=n91jQr+qgCcJIcIGQGuaH9PqUnzR9aO5uxTY0vV5EQ7P8ZMQez5gERd1DGEp3j1dJRprs7 yEPixlaefZJxpQWeM0hxxpWH167h5oEST7oCwHXh8v6U94E1WODNSxj14eWqgDf08DyCnC p6JES9sZL1iz9g2XWgBXZG54Y213i4CDKfwqndq7BhnEP+LdfFvaU2qHzHTXQoS+ObQCbl SrX+hbzIqkazRniR08pNSl0BFh9s9P50Tdgj1/3NVHu3qcHIrlorYf3BeD+7bs3HOzq9ce kGMbrzyWcUDG4tsVnLxSa21dipe5WiNcPnn2GR7i4jYD5hEYtWba2e630pPNTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=f5d638d085822b935b91aaa1fcbfa0b0f79a9434 commit f5d638d085822b935b91aaa1fcbfa0b0f79a9434 Author: Yuri Victorovich AuthorDate: 2022-06-25 02:35:54 +0000 Commit: Yuri Victorovich CommitDate: 2022-06-25 04:42:10 +0000 audio/jacktrip: Update 1.6.0 -> 1.6.1 Reported by: portscout --- audio/jacktrip/Makefile | 16 +++++++++++----- audio/jacktrip/distinfo | 10 +++++++--- audio/jacktrip/files/patch-CMakeLists.txt | 11 +++++++++++ audio/jacktrip/files/patch-jacktrip.pro | 11 ----------- audio/jacktrip/files/patch-src_UdpDataProtocol.cpp | 15 +++++++++++++++ 5 files changed, 44 insertions(+), 19 deletions(-) diff --git a/audio/jacktrip/Makefile b/audio/jacktrip/Makefile index a7609f37b3e7..9a5d68df9458 100644 --- a/audio/jacktrip/Makefile +++ b/audio/jacktrip/Makefile @@ -1,6 +1,6 @@ PORTNAME= jacktrip DISTVERSIONPREFIX= v -DISTVERSION= 1.6.0 +DISTVERSION= 1.6.1 CATEGORIES= audio MAINTAINER= yuri@FreeBSD.org @@ -9,17 +9,23 @@ COMMENT= Multi-machine audio network performance over the Internet LICENSE= MIT BUILD_DEPENDS= help2man:misc/help2man -LIB_DEPENDS= libjack.so:audio/jack +LIB_DEPENDS= libjack.so:audio/jack \ + librtaudio.so:audio/rtaudio -USES= compiler:c++11-lang gl pkgconfig qmake qt:5 -USE_QT= core gui network networkauth qml quick svg widgets buildtools_build +USES= meson compiler:c++11-lang gl pkgconfig qt:5 +USE_QT= core declarative gui network networkauth svg widgets buildtools_build USE_GL= gl USE_GITHUB= yes +GH_TUPLE= flathub:shared-modules:2c3a597:shared_modules/linux/flatpak/shared-modules \ + x42:weakjack:cddbeec:weakjack/externals/weakjack + +#CXXFLAGS+= `pkg-config --cflags rtaudio` +#LDFLAGS+= `pkg-config --libs rtaudio` QMAKE_SOURCE_PATH= ${PORTNAME}.pro PLIST_FILES= bin/${PORTNAME} \ - share/man/man1/jacktrip.1.gz + man/man1/jacktrip.1.gz .include diff --git a/audio/jacktrip/distinfo b/audio/jacktrip/distinfo index 1346557b2c02..8e16e0dc5706 100644 --- a/audio/jacktrip/distinfo +++ b/audio/jacktrip/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1654301837 -SHA256 (jacktrip-jacktrip-v1.6.0_GH0.tar.gz) = c08c7c04bfa9ad8c35c4b04b2de634731ff6bb39bdd27252fb6743077eb1c7e3 -SIZE (jacktrip-jacktrip-v1.6.0_GH0.tar.gz) = 5599251 +TIMESTAMP = 1656048701 +SHA256 (jacktrip-jacktrip-v1.6.1_GH0.tar.gz) = db48672bd40e7335242f9f5d8ae2028b2ad0f1d46353f927061df5a3697610a2 +SIZE (jacktrip-jacktrip-v1.6.1_GH0.tar.gz) = 5599695 +SHA256 (flathub-shared-modules-2c3a597_GH0.tar.gz) = 809e323d2f1b7d85c9e800d771d044da06fb94c6724e62aee6870061f430b408 +SIZE (flathub-shared-modules-2c3a597_GH0.tar.gz) = 58288 +SHA256 (x42-weakjack-cddbeec_GH0.tar.gz) = 752b48f022c34a28ff97dbd66715b3fe83532257884ea0b3146d790bafe21124 +SIZE (x42-weakjack-cddbeec_GH0.tar.gz) = 7983 diff --git a/audio/jacktrip/files/patch-CMakeLists.txt b/audio/jacktrip/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..95b3fb817486 --- /dev/null +++ b/audio/jacktrip/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2022-06-24 05:38:45 UTC ++++ CMakeLists.txt +@@ -46,7 +46,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") + endif () + endif () + +-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ++if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + find_package(PkgConfig REQUIRED) + pkg_check_modules(JACK REQUIRED IMPORTED_TARGET jack) + if (weakjack) diff --git a/audio/jacktrip/files/patch-jacktrip.pro b/audio/jacktrip/files/patch-jacktrip.pro deleted file mode 100644 index 689c2f86ca07..000000000000 --- a/audio/jacktrip/files/patch-jacktrip.pro +++ /dev/null @@ -1,11 +0,0 @@ ---- jacktrip.pro.orig 2022-01-07 17:52:55 UTC -+++ jacktrip.pro -@@ -5,7 +5,7 @@ - CONFIG += c++11 console - CONFIG -= app_bundle - --CONFIG += qt thread debug_and_release build_all -+CONFIG += qt thread release build_all - CONFIG(debug, debug|release) { - TARGET = jacktrip_debug - application_id = 'org.jacktrip.JackTrip.Devel' diff --git a/audio/jacktrip/files/patch-src_UdpDataProtocol.cpp b/audio/jacktrip/files/patch-src_UdpDataProtocol.cpp new file mode 100644 index 000000000000..05eb873dd9b7 --- /dev/null +++ b/audio/jacktrip/files/patch-src_UdpDataProtocol.cpp @@ -0,0 +1,15 @@ +- workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=264865 + +--- src/UdpDataProtocol.cpp.orig 2022-06-24 05:34:49 UTC ++++ src/UdpDataProtocol.cpp +@@ -293,8 +293,10 @@ int UdpDataProtocol::bindSocket() + } + + // Set 802.1q QoS priority ++# if !defined(__FreeBSD__) // is there a FreeBSD replacement? + int priority = 6; + ::setsockopt(sock_fd, SOL_SOCKET, SO_PRIORITY, &priority, sizeof(priority)); ++# endif + #endif + + // Bind the Socket