From nobody Thu Jan 23 03:15:36 2025 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 4YdmKh6Qnkz5lVpN; Thu, 23 Jan 2025 03:15:36 +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 4YdmKh5ZVDz4644; Thu, 23 Jan 2025 03:15:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737602136; 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=4YqNmUxDOYzWLxO1+Gz5nvSWH/0Mag590w2NWvaD3BI=; b=HCgprbRw6OZhyu0YdSKJKgec7Uij9hq1awvgOFr9WPR6U8Kp9hhOsxpSV9p6dHL+ja2M1u sp/doltjznFhvimelGkW57Ya1Mde35T/40y8hihtAqHXO/XpC53rIE6DNH/aRYCg1U/myu lIIxNAuga0HcuHcHNBsz34c3z2zr2OJ2/yFIv92TieY1+nd+tzuFywo0oNFfg32vebDKaN cTozExpZJIvP436mGbpz1cxDRGZisR0Pf1s//DtngWT2T075Tlj4H5GuLNwdynOsRCtdnC mIiwESz6+T+K/WkRQdnH/dotIP2YzZ5JjcN9QDzZy8z5c+tEZ44jI0In3Ojw2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737602136; 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=4YqNmUxDOYzWLxO1+Gz5nvSWH/0Mag590w2NWvaD3BI=; b=U+v+XWKIwz5uJOmoQATjHm9Adr91TiQzFLC6iE7pwxA03CvboXdlMTgbP7VaB7z0vfHpwC B1aJcJdmubrSIWQBcqvd3jk18LTZOv2YdlSLhbSRUauo7j3U+P5w+pvkESEgTeFkX27Ck5 TbZiPjgTzKZGzsiaY5O1O0A581XDiDfd5dBcNKdbvav2shk35v3grCRTktG+HrZ/jngGeu SfkgWdJG1/EkwhTgY7tNEBHkF/QiFIQMmzvThm1fFLRQwmvAagt9GP3VZGi0txiQhvAjQW 6ecKBj6nWgRVa++YQxq40orYqJroWrNBbK/2XDrAehDwfd8pzqY+f5qe8g6VIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737602136; a=rsa-sha256; cv=none; b=Qxl6bCkMk7x2SpCe2Ohm4piVAKH6p47tFFDXcabYd1bdla05XeYSXdGVla5PftTeshx6B5 ZXE2nbaaDXqRf+6ria1QS0IysjHr+/LJUvOWah1MDD87miuHMe+8+QRXVap49KSmJLaC8D im4adn6uah4iAJNk1xYx9c65VQDEqOMG5F7veiJSJVHyS4jDZyAM3uobfHd/Fd2V1avTIW HvFU866uSNsstFeTGDCXAwBrUl9kJEoLeGHTBrEgD2c5scp3mA5KAWJ2xluY7rjoAyqPb+ D5OTs8MRmUa3reo/IYooelwC7tMoenbLVczNT2jdbZaL1G2GYUZ6aZixdMURZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YdmKh56VYz5r8; Thu, 23 Jan 2025 03:15:36 +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 50N3Faf2026329; Thu, 23 Jan 2025 03:15:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50N3Fa1D026326; Thu, 23 Jan 2025 03:15:36 GMT (envelope-from git) Date: Thu, 23 Jan 2025 03:15:36 GMT Message-Id: <202501230315.50N3Fa1D026326@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: da48aad3fc28 - main - =?utf-8?Q?audio/jacktrip: update 2.4.1 =E2=86=92 2.5.0?= 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da48aad3fc28b20927bff83795966485d2e82f7c Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=da48aad3fc28b20927bff83795966485d2e82f7c commit da48aad3fc28b20927bff83795966485d2e82f7c Author: Yuri Victorovich AuthorDate: 2025-01-23 01:07:29 +0000 Commit: Yuri Victorovich CommitDate: 2025-01-23 03:14:02 +0000 audio/jacktrip: update 2.4.1 → 2.5.0 --- audio/jacktrip/Makefile | 13 ++++++------- audio/jacktrip/distinfo | 6 +++--- audio/jacktrip/files/patch-CMakeLists.txt | 20 ++++++++++++++++---- audio/jacktrip/files/patch-src_UdpDataProtocol.cpp | 4 ++-- 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/audio/jacktrip/Makefile b/audio/jacktrip/Makefile index ff5c4c1ec392..4ff6d453fbac 100644 --- a/audio/jacktrip/Makefile +++ b/audio/jacktrip/Makefile @@ -1,6 +1,6 @@ PORTNAME= jacktrip DISTVERSIONPREFIX= v -DISTVERSION= 2.4.1 +DISTVERSION= 2.5.0 CATEGORIES= audio MAINTAINER= yuri@FreeBSD.org @@ -14,18 +14,17 @@ BUILD_DEPENDS= help2man:misc/help2man LIB_DEPENDS= libjack.so:audio/jack \ librtaudio.so:audio/rtaudio -USES= meson compiler:c++17-lang gl pkgconfig qt:6 -USE_QT= 5compat base declarative svg webchannel webengine websockets +USES= cmake compiler:c++17-lang gl localbase:ldflags pkgconfig qt:6 +USE_QT= base declarative networkauth positioning svg webchannel webengine websockets USE_GL= gl USE_GITHUB= yes GH_TUPLE= jothepro:doxygen-awesome-css:9380569:jothepro_doxygen_awesome_css/externals/doxygen-awesome-css \ x42:weakjack:cddbeec0953d68048d164c472c9b30a5d96778db:x42_weakjack/externals/weakjack -#CXXFLAGS+= `pkg-config --cflags rtaudio` -#LDFLAGS+= `pkg-config --libs rtaudio` - -QMAKE_SOURCE_PATH= ${PORTNAME}.pro +# workaround for https://github.com/jacktrip/jacktrip/issues/1381 +CXXFLAGS+= `pkg-config --cflags rtaudio Qt6QuickControls2 Qt6Svg Qt6WebChannel Qt6WebEngineCore Qt6WebEngineQuick` +LDFLAGS+= `pkg-config --libs rtaudio Qt6QuickControls2 Qt6Svg Qt6WebChannel Qt6WebEngineCore Qt6WebEngineQuick` PLIST_FILES= bin/${PORTNAME} diff --git a/audio/jacktrip/distinfo b/audio/jacktrip/distinfo index b70b0ec3a864..955e98f49ec0 100644 --- a/audio/jacktrip/distinfo +++ b/audio/jacktrip/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1727499960 -SHA256 (jacktrip-jacktrip-v2.4.1_GH0.tar.gz) = b3e3ce2be811fc3d08b70eafb03ec5764d31dcad8d19d9b118fe6d4d4b4e8899 -SIZE (jacktrip-jacktrip-v2.4.1_GH0.tar.gz) = 6295890 +TIMESTAMP = 1737535203 +SHA256 (jacktrip-jacktrip-v2.5.0_GH0.tar.gz) = c936ccc638d35fd4fd2b42c00ea9851fc52ed626c2fa76fa6b99481d05b6f5e9 +SIZE (jacktrip-jacktrip-v2.5.0_GH0.tar.gz) = 7597912 SHA256 (jothepro-doxygen-awesome-css-9380569_GH0.tar.gz) = b57aa7345f76f23521f81c1d12d8286a33c47cf94b5ad38a85bdcf46c6aff5cc SIZE (jothepro-doxygen-awesome-css-9380569_GH0.tar.gz) = 431473 SHA256 (x42-weakjack-cddbeec0953d68048d164c472c9b30a5d96778db_GH0.tar.gz) = 451a660ae579cc3d31d369efa08d2b7680fc3a7bfec7832e61d8b11575ad8d14 diff --git a/audio/jacktrip/files/patch-CMakeLists.txt b/audio/jacktrip/files/patch-CMakeLists.txt index 95b3fb817486..c1ed1d89bb88 100644 --- a/audio/jacktrip/files/patch-CMakeLists.txt +++ b/audio/jacktrip/files/patch-CMakeLists.txt @@ -1,11 +1,23 @@ ---- CMakeLists.txt.orig 2022-06-24 05:38:45 UTC +-- 2nd part is a workaround for https://github.com/jacktrip/jacktrip/issues/1381 + +--- CMakeLists.txt.orig 2025-01-21 17:04:33 UTC +++ CMakeLists.txt -@@ -46,7 +46,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") - endif () - endif () +@@ -101,7 +101,7 @@ string(PREPEND QtVersion "Qt") + + string(PREPEND QtVersion "Qt") -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) +@@ -217,6 +217,9 @@ if (NOT nogui) + src/vs/vsAudio.cpp + src/vs/vsWebSocket.cpp + src/vs/vsPermissions.cpp ++ src/vs/vsPinger.cpp ++ src/vs/vsPing.cpp ++ src/vs/WebSocketTransport.cpp + src/vs/vs.qrc + src/images/images.qrc + src/Analyzer.cpp diff --git a/audio/jacktrip/files/patch-src_UdpDataProtocol.cpp b/audio/jacktrip/files/patch-src_UdpDataProtocol.cpp index 869f0a5488af..822b0752f803 100644 --- a/audio/jacktrip/files/patch-src_UdpDataProtocol.cpp +++ b/audio/jacktrip/files/patch-src_UdpDataProtocol.cpp @@ -1,6 +1,6 @@ ---- src/UdpDataProtocol.cpp.orig 2024-09-14 06:44:01 UTC +--- src/UdpDataProtocol.cpp.orig 2025-01-21 17:04:33 UTC +++ src/UdpDataProtocol.cpp -@@ -383,12 +383,14 @@ bool UdpDataProtocol::setSocketQos(socket_type& sock_f +@@ -388,12 +388,14 @@ bool UdpDataProtocol::setSocketQos(socket_type& sock_f } // Set 802.1q QoS priority