audio/jacktrip: update 2.4.1 → 2.5.0

This commit is contained in:
Yuri Victorovich 2025-01-22 17:07:29 -08:00
parent 278ce19c92
commit da48aad3fc
4 changed files with 27 additions and 16 deletions

View file

@ -1,6 +1,6 @@
PORTNAME= jacktrip PORTNAME= jacktrip
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
DISTVERSION= 2.4.1 DISTVERSION= 2.5.0
CATEGORIES= audio CATEGORIES= audio
MAINTAINER= yuri@FreeBSD.org MAINTAINER= yuri@FreeBSD.org
@ -14,18 +14,17 @@ BUILD_DEPENDS= help2man:misc/help2man
LIB_DEPENDS= libjack.so:audio/jack \ LIB_DEPENDS= libjack.so:audio/jack \
librtaudio.so:audio/rtaudio librtaudio.so:audio/rtaudio
USES= meson compiler:c++17-lang gl pkgconfig qt:6 USES= cmake compiler:c++17-lang gl localbase:ldflags pkgconfig qt:6
USE_QT= 5compat base declarative svg webchannel webengine websockets USE_QT= base declarative networkauth positioning svg webchannel webengine websockets
USE_GL= gl USE_GL= gl
USE_GITHUB= yes USE_GITHUB= yes
GH_TUPLE= jothepro:doxygen-awesome-css:9380569:jothepro_doxygen_awesome_css/externals/doxygen-awesome-css \ GH_TUPLE= jothepro:doxygen-awesome-css:9380569:jothepro_doxygen_awesome_css/externals/doxygen-awesome-css \
x42:weakjack:cddbeec0953d68048d164c472c9b30a5d96778db:x42_weakjack/externals/weakjack x42:weakjack:cddbeec0953d68048d164c472c9b30a5d96778db:x42_weakjack/externals/weakjack
#CXXFLAGS+= `pkg-config --cflags rtaudio` # workaround for https://github.com/jacktrip/jacktrip/issues/1381
#LDFLAGS+= `pkg-config --libs rtaudio` CXXFLAGS+= `pkg-config --cflags rtaudio Qt6QuickControls2 Qt6Svg Qt6WebChannel Qt6WebEngineCore Qt6WebEngineQuick`
LDFLAGS+= `pkg-config --libs rtaudio Qt6QuickControls2 Qt6Svg Qt6WebChannel Qt6WebEngineCore Qt6WebEngineQuick`
QMAKE_SOURCE_PATH= ${PORTNAME}.pro
PLIST_FILES= bin/${PORTNAME} PLIST_FILES= bin/${PORTNAME}

View file

@ -1,6 +1,6 @@
TIMESTAMP = 1727499960 TIMESTAMP = 1737535203
SHA256 (jacktrip-jacktrip-v2.4.1_GH0.tar.gz) = b3e3ce2be811fc3d08b70eafb03ec5764d31dcad8d19d9b118fe6d4d4b4e8899 SHA256 (jacktrip-jacktrip-v2.5.0_GH0.tar.gz) = c936ccc638d35fd4fd2b42c00ea9851fc52ed626c2fa76fa6b99481d05b6f5e9
SIZE (jacktrip-jacktrip-v2.4.1_GH0.tar.gz) = 6295890 SIZE (jacktrip-jacktrip-v2.5.0_GH0.tar.gz) = 7597912
SHA256 (jothepro-doxygen-awesome-css-9380569_GH0.tar.gz) = b57aa7345f76f23521f81c1d12d8286a33c47cf94b5ad38a85bdcf46c6aff5cc SHA256 (jothepro-doxygen-awesome-css-9380569_GH0.tar.gz) = b57aa7345f76f23521f81c1d12d8286a33c47cf94b5ad38a85bdcf46c6aff5cc
SIZE (jothepro-doxygen-awesome-css-9380569_GH0.tar.gz) = 431473 SIZE (jothepro-doxygen-awesome-css-9380569_GH0.tar.gz) = 431473
SHA256 (x42-weakjack-cddbeec0953d68048d164c472c9b30a5d96778db_GH0.tar.gz) = 451a660ae579cc3d31d369efa08d2b7680fc3a7bfec7832e61d8b11575ad8d14 SHA256 (x42-weakjack-cddbeec0953d68048d164c472c9b30a5d96778db_GH0.tar.gz) = 451a660ae579cc3d31d369efa08d2b7680fc3a7bfec7832e61d8b11575ad8d14

View file

@ -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 +++ CMakeLists.txt
@@ -46,7 +46,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") @@ -101,7 +101,7 @@ string(PREPEND QtVersion "Qt")
endif ()
endif () 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")
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") +if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(JACK REQUIRED IMPORTED_TARGET jack) pkg_check_modules(JACK REQUIRED IMPORTED_TARGET jack)
if (weakjack) 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

View file

@ -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 +++ 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 // Set 802.1q QoS priority