diff --git a/audio/jack/Makefile b/audio/jack/Makefile index 759b282f9fe0..60f7c79cfd8e 100644 --- a/audio/jack/Makefile +++ b/audio/jack/Makefile @@ -1,70 +1,66 @@ PORTNAME= jackit DISTVERSIONPREFIX= v -DISTVERSION= 1.9.20 -PORTREVISION= 1 +DISTVERSION= 1.9.21 CATEGORIES= audio -PATCH_SITES= https://github.com/jackaudio/jack2/commit/ -PATCHFILES+= 21b293dbc37d42446141a08922cdec0d2550c6a0.patch:-p1 - MAINTAINER= dev@submerge.ch COMMENT= Low latency audio server LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi LIB_DEPENDS= libsamplerate.so:audio/libsamplerate \ libsysinfo.so:devel/libsysinfo USES= compiler:c11 pkgconfig python:3.4+ shebangfix waf USE_LDCONFIG= yes USE_RC_SUBR= jackd USE_GITHUB= yes GH_ACCOUNT= jackaudio GH_PROJECT= jack2 CFLAGS+= -fPIC CPPFLAGS+= -I${LOCALBASE}/include SHEBANG_FILES= dbus/jack_control SHEBANG_LANG= python3 CONFIGURE_ARGS= --celt=no --sndfile=no --samplerate=yes \ --readline=no --example-tools=no OPTIONS_DEFINE= ALSA DBUS OPUS PROFILING OPTIONS_DEFAULT= DBUS OPUS OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CONFIGURE_OFF= --alsa=no ALSA_CONFIGURE_ON= --alsa=yes DBUS_CONFIGURE_ON= --dbus --classic --autostart=dbus DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus \ libexpat.so:textproc/expat2 DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_CONFIGURE_ON= --opus=yes OPUS_CONFIGURE_OFF= --opus=no PROFILING_DESC= Build with profiling information PROFILING_CONFIGURE_ON= --profile .include .if ${PORT_OPTIONS:MDBUS} PLIST_SUB+= CLASSIC="@comment " .else PLIST_SUB+= CLASSIC="" .endif post-install: @cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} \ lib/libjack*.so \ lib/jack/*.so \ $$(ls bin/* | ${GREP} -v jack_control) .include diff --git a/audio/jack/distinfo b/audio/jack/distinfo index 110a54242cd8..8f3fc1eec3d4 100644 --- a/audio/jack/distinfo +++ b/audio/jack/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1644418071 -SHA256 (jackaudio-jack2-v1.9.20_GH0.tar.gz) = 915ad2900992159bdb729b9fc4ea134b962ce32b2df0b384fee40a2c5808835d -SIZE (jackaudio-jack2-v1.9.20_GH0.tar.gz) = 1005000 -SHA256 (21b293dbc37d42446141a08922cdec0d2550c6a0.patch) = 19722d6f2e991006c6f1e470e7bc986ee3ca18ad0f9eb74b01332231c807554f -SIZE (21b293dbc37d42446141a08922cdec0d2550c6a0.patch) = 3952 +TIMESTAMP = 1650059296 +SHA256 (jackaudio-jack2-v1.9.21_GH0.tar.gz) = 8b044a40ba5393b47605a920ba30744fdf8bf77d210eca90d39c8637fe6bc65d +SIZE (jackaudio-jack2-v1.9.21_GH0.tar.gz) = 1006157 diff --git a/audio/jack/files/patch-common_JackError.cpp b/audio/jack/files/patch-common_JackError.cpp deleted file mode 100644 index 6782fc71318e..000000000000 --- a/audio/jack/files/patch-common_JackError.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- common/JackError.cpp.orig 2022-01-15 18:51:10 UTC -+++ common/JackError.cpp -@@ -133,5 +133,5 @@ SERVER_EXPORT void silent_jack_error_callback(const ch - SERVER_EXPORT void silent_jack_info_callback(const char *desc) - {} - --SERVER_EXPORT void (*jack_error_callback)(const char *desc) = &default_jack_error_callback; --SERVER_EXPORT void (*jack_info_callback)(const char *desc) = &default_jack_info_callback; -+LIB_EXPORT void (*jack_error_callback)(const char *desc) = &default_jack_error_callback; -+LIB_EXPORT void (*jack_info_callback)(const char *desc) = &default_jack_info_callback; diff --git a/audio/jack/files/patch-common_JackError.h b/audio/jack/files/patch-common_JackError.h deleted file mode 100644 index 073040eaede7..000000000000 --- a/audio/jack/files/patch-common_JackError.h +++ /dev/null @@ -1,13 +0,0 @@ ---- common/JackError.h.orig 2022-01-15 18:51:23 UTC -+++ common/JackError.h -@@ -35,8 +35,8 @@ extern "C" - SERVER_EXPORT void jack_info(const char *fmt, ...); - SERVER_EXPORT void jack_log(const char *fmt, ...); - -- SERVER_EXPORT extern void (*jack_error_callback)(const char *desc); -- SERVER_EXPORT extern void (*jack_info_callback)(const char *desc); -+ LIB_EXPORT extern void (*jack_error_callback)(const char *desc); -+ LIB_EXPORT extern void (*jack_info_callback)(const char *desc); - - SERVER_EXPORT extern void default_jack_error_callback(const char *desc); - SERVER_EXPORT extern void default_jack_info_callback(const char *desc);