pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/jack jack: Update to 1.9.21
details: https://anonhg.NetBSD.org/pkgsrc/rev/432785b09875
branches: trunk
changeset: 391293:432785b09875
user: triaxx <triaxx%pkgsrc.org@localhost>
date: Sat Jan 07 21:20:19 2023 +0000
description:
jack: Update to 1.9.21
upstream changes:
-----------------
1.9.21 Latest
=============
o Add shell mode to jack_control (executes commands from stdin until EOF)
o The waf autooption --example-tools introduced in 1.9.20 is now off by
default,
o To get the previous behavior back pass --example-tools during build.
o This flag (and the related tools and their code) are going to be removed in
the next release.
o Fix alignas() on non-packed architectures
o Fix build of jack-example-tools man pages (1.9.20 regression)
o Fix compatibility with macOS 12
o Fix missing symbols from jack client library (error and info callback
pointers)
o Fix potential memory corruption in midi_latency_test tool
o Fix JackWeakAPI on Windows
o Use predefined variables in pkg-config file (required for mingw)
External changes, related to macOS/Windows installer:
o Fix application style in QJackCtl (qwindowsvistastyle.dll was missing)
o Update QjackCtl used in macOS/Windows installers to 0.9.7
1.9.20
======
o Add waf autooption --example-tools to allow optional build of executables,
libraries and man pages provided by jack-example-tools (the files are built
by default).
o Building and installing the additional files can be disabled by using
--example-tools=no or --no-example-tools.
o Fix 32-bit support in ALSA driver
o Fix incomplete ASIO support on Windows
o Fix metadata usage with multiple users
o Fix netsource tool missing on Windows
o Fix semaphore usage on macOS
o Official FreeBSD support
External changes, related to macOS/Windows installer:
o Update Qt5 used in macOS/Windows installers to 5.12.12
o Update QjackCtl used in macOS/Windows installers to 0.9.6
diffstat:
audio/jack/Makefile | 7 +-
audio/jack/PLIST | 62 +---------
audio/jack/distinfo | 25 +-
audio/jack/patches/patch-common_JackAudioAdapterFactory.cpp | 6 +-
audio/jack/patches/patch-common_wscript | 87 +++++++-----
audio/jack/patches/patch-example-clients_wscript | 24 +-
audio/jack/patches/patch-man_fill__template | 15 ++
audio/jack/patches/patch-man_wscript | 13 +-
audio/jack/patches/patch-posix_JackPosixSemaphore.cpp | 28 +--
audio/jack/patches/patch-tests_wscript | 14 +-
audio/jack/patches/patch-tools_wscript | 21 +--
audio/jack/patches/patch-wscript | 39 ++--
audio/jack/platform.mk | 6 +-
13 files changed, 147 insertions(+), 200 deletions(-)
diffs (truncated from 657 to 300 lines):
diff -r f32c6ff0b88b -r 432785b09875 audio/jack/Makefile
--- a/audio/jack/Makefile Sat Jan 07 19:31:51 2023 +0000
+++ b/audio/jack/Makefile Sat Jan 07 21:20:19 2023 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2022/09/11 12:51:03 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2023/01/07 21:20:19 triaxx Exp $
-DISTNAME= jack2-1.9.19
+DISTNAME= jack2-1.9.21
PKGNAME= ${DISTNAME:S/jack2/jack/1}
-PKGREVISION= 6
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GITHUB:=jackaudio/}
GITHUB_PROJECT= jack2
@@ -51,8 +50,6 @@
.endif
REPLACE_PYTHON+= waf
-REPLACE_PYTHON+= tools/jack_control
-REPLACE_BASH+= svnversion_regenerate.sh
PYTHON_VERSIONS_INCOMPATIBLE= 27
diff -r f32c6ff0b88b -r 432785b09875 audio/jack/PLIST
--- a/audio/jack/PLIST Sat Jan 07 19:31:51 2023 +0000
+++ b/audio/jack/PLIST Sat Jan 07 21:20:19 2023 +0000
@@ -1,43 +1,6 @@
-@comment $NetBSD: PLIST,v 1.15 2022/04/18 15:56:34 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.16 2023/01/07 21:20:19 triaxx Exp $
${PLIST.alsa}bin/alsa_in
${PLIST.alsa}bin/alsa_out
-bin/jack_alias
-bin/jack_bufsize
-bin/jack_connect
-bin/jack_control
-bin/jack_cpu
-bin/jack_cpu_load
-bin/jack_disconnect
-bin/jack_evmon
-bin/jack_freewheel
-bin/jack_iodelay
-bin/jack_latent_client
-bin/jack_load
-bin/jack_lsp
-bin/jack_metro
-bin/jack_midi_dump
-bin/jack_midi_latency_test
-bin/jack_midiseq
-bin/jack_midisine
-bin/jack_monitor_client
-bin/jack_multiple_metro
-bin/jack_net_master
-bin/jack_net_slave
-bin/jack_netsource
-bin/jack_property
-bin/jack_rec
-bin/jack_samplerate
-bin/jack_server_control
-bin/jack_session_notify
-bin/jack_showtime
-bin/jack_simdtests
-bin/jack_simple_client
-bin/jack_simple_session_client
-bin/jack_test
-bin/jack_thru
-bin/jack_unload
-bin/jack_wait
-bin/jack_zombie
bin/jackd
include/jack/control.h
include/jack/intclient.h
@@ -57,7 +20,6 @@
include/jack/weakjack.h
include/jack/weakmacros.h
lib/jack/audioadapter.so
-lib/jack/inprocess.so
${PLIST.alsa}lib/jack/jack_alsa.so
${PLIST.alsa}lib/jack/jack_alsarawmidi.so
${PLIST.boomer}lib/jack/jack_boomer.so
@@ -83,25 +45,3 @@
lib/libjackserver.so.0
lib/libjackserver.so.0.1.0
lib/pkgconfig/jack.pc
-man/man1/alsa_in.1
-man/man1/alsa_out.1
-man/man1/jack_bufsize.1
-man/man1/jack_connect.1
-man/man1/jack_disconnect.1
-man/man1/jack_freewheel.1
-man/man1/jack_impulse_grabber.1
-man/man1/jack_iodelay.1
-man/man1/jack_load.1
-man/man1/jack_lsp.1
-man/man1/jack_metro.1
-man/man1/jack_monitor_client.1
-man/man1/jack_netsource.1
-man/man1/jack_property.1
-man/man1/jack_samplerate.1
-man/man1/jack_showtime.1
-man/man1/jack_simple_client.1
-man/man1/jack_transport.1
-man/man1/jack_unload.1
-man/man1/jack_wait.1
-man/man1/jackd.1
-man/man1/jackrec.1
diff -r f32c6ff0b88b -r 432785b09875 audio/jack/distinfo
--- a/audio/jack/distinfo Sat Jan 07 19:31:51 2023 +0000
+++ b/audio/jack/distinfo Sat Jan 07 21:20:19 2023 +0000
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.34 2023/01/07 19:04:34 wiz Exp $
+$NetBSD: distinfo,v 1.35 2023/01/07 21:20:19 triaxx Exp $
-BLAKE2s (jack2-1.9.19.tar.gz) = aa43a3ae606c00e7c8e047e89250e068717f44fa0443b8531a6d83ca2a9dff71
-SHA512 (jack2-1.9.19.tar.gz) = d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d
-Size (jack2-1.9.19.tar.gz) = 988780 bytes
-SHA1 (patch-common_JackAudioAdapterFactory.cpp) = 8292a8c88c673136f52a007133278f9b4403839c
+BLAKE2s (jack2-1.9.21.tar.gz) = c4f0db4449051bad70a61ab62e67eea5874457459ad6d6866cf4b1efb127119c
+SHA512 (jack2-1.9.21.tar.gz) = 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557
+Size (jack2-1.9.21.tar.gz) = 1006157 bytes
+SHA1 (patch-common_JackAudioAdapterFactory.cpp) = b66c601cfcd565dbabcbac4747f9d1b17a2241ff
SHA1 (patch-common_memops.c) = 468476c6067595524f492d37f3b761af48e78585
-SHA1 (patch-common_wscript) = 0f52fd48cd45c08c18650b7a0770ef76ac193362
-SHA1 (patch-example-clients_wscript) = 9db0899e797acbc416bfd9e6aba50c70bd5ff0ab
-SHA1 (patch-man_wscript) = bc5ce9481d4c911350f260c069a0ce4be732f526
+SHA1 (patch-common_wscript) = 9f229c13f1950b244a2631f486e5ff734b1ed356
+SHA1 (patch-example-clients_wscript) = d08cd1552925126e28ed4204cda87ebb12ddcd24
+SHA1 (patch-man_fill__template) = b101ef707733d0d9d78de812a564a17345bee5e1
+SHA1 (patch-man_wscript) = 05f58e1a46d22ec3b5f74ed72ebbe44164e50006
SHA1 (patch-netbsd_JackAtomic__os.h) = cd9cc4bf9913b3dedfbb8a2ea34077277e17f85d
SHA1 (patch-netbsd_JackNetBSDTime.c) = 7cc2504bbd452b703dd062ac5d35f68ffe7e3b0a
SHA1 (patch-netbsd_JackPlatformPlug__os.h) = f17b0daf4d8a4ef1001b35e6ea1411cfb1b981c2
@@ -17,11 +18,11 @@
SHA1 (patch-netbsd_sun_JackSunDriver.h) = 9da5fbec2216081876174057f831da4c54e3029e
SHA1 (patch-posix_JackNetUnixSocket.cpp) = 562242daf7c0f296bfcd03f468518aaf18d995d9
SHA1 (patch-posix_JackNetUnixSocket.h) = ce9a9255dc0dd423562b94b0fcc1012c8ba3a37e
-SHA1 (patch-posix_JackPosixSemaphore.cpp) = 59425ada11a5cab83159691ae10a23c0d36750ef
+SHA1 (patch-posix_JackPosixSemaphore.cpp) = 7d02f92dd6054014abf13ad1fd3aa7d8681990db
SHA1 (patch-posix_JackPosixThread.h) = 0aa94425ad44cc36fb583e48bdfa9f5f33a5eaa3
SHA1 (patch-posix_JackSocket.cpp) = 88ae18c3d2cc31a43355ff9b0c78ab13b83bd314
-SHA1 (patch-tests_wscript) = e0bf616175a116df489808cda8cb8c70890d4da0
-SHA1 (patch-tools_wscript) = fab7472b29fc6e46ba1e8ca94c12aa8808b075da
+SHA1 (patch-tests_wscript) = d79f0c5fefed422c36a3571fce7188a799e57a5d
+SHA1 (patch-tools_wscript) = 67c4b8d4162c3bce737fcb5ee69314b4f6833fc1
SHA1 (patch-waflib_ConfigSet.py) = 8f4cf15e16dae9f64ee7d5f65fe8c633cea7d1c0
SHA1 (patch-waflib_Context.py) = b68ec440239d877680e1425907a42f8412f7e7da
-SHA1 (patch-wscript) = a49c6e7ebd84bb5156576351308676b0b3486492
+SHA1 (patch-wscript) = 758ac2e0519d3529e2d5a7214ce1c12a10a5f397
diff -r f32c6ff0b88b -r 432785b09875 audio/jack/patches/patch-common_JackAudioAdapterFactory.cpp
--- a/audio/jack/patches/patch-common_JackAudioAdapterFactory.cpp Sat Jan 07 19:31:51 2023 +0000
+++ b/audio/jack/patches/patch-common_JackAudioAdapterFactory.cpp Sat Jan 07 21:20:19 2023 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-common_JackAudioAdapterFactory.cpp,v 1.1 2021/09/08 19:19:20 nia Exp $
+$NetBSD: patch-common_JackAudioAdapterFactory.cpp,v 1.2 2023/01/07 21:20:19 triaxx Exp $
Add NetBSD support.
---- common/JackAudioAdapterFactory.cpp.orig 2021-07-15 06:18:26.000000000 +0000
+--- common/JackAudioAdapterFactory.cpp.orig 2022-04-15 19:14:06.000000000 +0000
+++ common/JackAudioAdapterFactory.cpp
@@ -35,6 +35,11 @@ Foundation, Inc., 675 Mass Ave, Cambridg
#define JackPlatformAdapter JackAlsaAdapter
@@ -13,6 +13,6 @@
+#define JackPlatformAdapter JackSunAdapter
+#endif
+
- #if defined(__sun__) || defined(sun)
+ #if defined(__sun__) || defined(sun) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include "JackOSSAdapter.h"
#define JackPlatformAdapter JackOSSAdapter
diff -r f32c6ff0b88b -r 432785b09875 audio/jack/patches/patch-common_wscript
--- a/audio/jack/patches/patch-common_wscript Sat Jan 07 19:31:51 2023 +0000
+++ b/audio/jack/patches/patch-common_wscript Sat Jan 07 21:20:19 2023 +0000
@@ -1,28 +1,28 @@
-$NetBSD: patch-common_wscript,v 1.6 2023/01/07 19:04:34 wiz Exp $
+$NetBSD: patch-common_wscript,v 1.7 2023/01/07 21:20:19 triaxx Exp $
Add NetBSD support.
---- common/wscript.orig 2021-07-15 06:18:26.000000000 +0000
+--- common/wscript.orig 2022-04-15 19:14:06.000000000 +0000
+++ common/wscript
-@@ -28,6 +28,8 @@ def create_jack_process_obj(bld, target,
+@@ -31,6 +31,8 @@ def create_jack_process_obj(bld, target,
env_includes = ['../macosx', '../posix', '../macosx/coreaudio']
if bld.env['IS_LINUX']:
env_includes = ['../linux', '../posix', '../linux/alsa']
+ if bld.env['IS_NETBSD']:
+ env_includes = ['../netbsd', '../posix', '../netbsd/sun']
+ if bld.env['IS_FREEBSD']:
+ env_includes = ['../freebsd', '../posix', '../solaris/oss']
if bld.env['IS_SUN']:
- env_includes = ['../solaris', '../posix', '../solaris/oss']
- if bld.env['IS_WINDOWS']:
-@@ -36,7 +38,7 @@ def create_jack_process_obj(bld, target,
- process.name = target
- process.target = target
- process.source = sources
-- if bld.env['IS_LINUX'] or bld.env['IS_MACOSX']:
-+ if bld.env['IS_LINUX'] or bld.env['IS_NETBSD'] or bld.env['IS_MACOSX']:
+@@ -41,7 +43,7 @@ def create_jack_process_obj(bld, target,
+ process.name = target
+ process.target = target
+ process.source = sources
+- if bld.env['IS_LINUX'] or bld.env['IS_MACOSX'] or bld.env['IS_FREEBSD']:
++ if bld.env['IS_LINUX'] or bld.env['IS_NETBSD'] or bld.env['IS_MACOSX'] or bld.env['IS_FREEBSD']:
process.env.append_value('CPPFLAGS', '-fvisibility=hidden')
process.install_path = '${ADDON_DIR}/'
process.use = [uselib.name]
-@@ -92,6 +94,21 @@ def build(bld):
+@@ -98,6 +100,21 @@ def build(bld):
uselib.append('RT')
uselib.append('DL')
@@ -41,10 +41,10 @@
+ includes = ['../netbsd', '../posix'] + includes
+ uselib.append('RT')
+
- if bld.env['IS_SUN']:
+ if bld.env['IS_FREEBSD']:
common_libsources += [
'JackDebugClient.cpp',
-@@ -176,6 +193,12 @@ def build(bld):
+@@ -197,6 +214,12 @@ def build(bld):
'../posix/JackPosixServerLaunch.cpp',
]
@@ -54,18 +54,20 @@
+ '../posix/JackPosixServerLaunch.cpp',
+ ]
+
- if bld.env['IS_SUN']:
+ if bld.env['IS_FREEBSD']:
clientlib.source += [
'../posix/JackSocketClientChannel.cpp',
-@@ -205,12 +228,16 @@ def build(bld):
+@@ -232,6 +255,9 @@ def build(bld):
if bld.env['IS_LINUX']:
clientlib.env.append_value('CPPFLAGS', '-fvisibility=hidden')
+ if bld.env['IS_NETBSD']:
+ clientlib.env.append_value('CPPFLAGS', '-fvisibility=hidden')
+
- if bld.env['IS_MACOSX']:
+ if bld.env['IS_FREEBSD']:
clientlib.env.append_value('CPPFLAGS', '-fvisibility=hidden')
+
+@@ -240,7 +266,8 @@ def build(bld):
clientlib.env.append_value('LINKFLAGS', '-single_module')
if bld.env['IS_SUN']:
@@ -75,7 +77,7 @@
if bld.variant:
# if there is variant defined, we expect it to be the 32bit client lib one
-@@ -281,6 +308,14 @@ def build(bld):
+@@ -311,6 +338,14 @@ def build(bld):
'../posix/JackNetUnixSocket.cpp',
]
@@ -87,10 +89,10 @@
+ '../posix/JackNetUnixSocket.cpp',
+ ]
+
- if bld.env['IS_SUN']:
+ if bld.env['IS_FREEBSD']:
serverlib.source += [
'../posix/JackSocketServerChannel.cpp',
-@@ -313,15 +348,21 @@ def build(bld):
+@@ -351,15 +386,21 @@ def build(bld):
elif not bld.env['IS_WINDOWS']:
serverlib.vnum = bld.env['JACK_API_VERSION']
@@ -112,27 +114,35 @@
+ serverlib.env.append_value('LINKFLAGS', '-lsocket')
if bld.env['BUILD_NETLIB']:
- netlib = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib'])
-@@ -360,10 +401,15 @@ def build(bld):
- netlib.source += ['../posix/JackNetUnixSocket.cpp','../posix/JackPosixThread.cpp', '../posix/JackPosixMutex.cpp', '../linux/JackLinuxTime.c']
+ netlib = bld(features=['c', 'cxx', 'cxxshlib', 'cshlib'])
+@@ -403,6 +444,15 @@ def build(bld):
+ ]
netlib.env.append_value('CPPFLAGS', '-fvisibility=hidden')
+ if bld.env['IS_NETBSD']:
-+ netlib.source += ['../posix/JackNetUnixSocket.cpp','../posix/JackPosixThread.cpp', '../posix/JackPosixMutex.cpp', '../netbsd/JackNetBSDTime.c']
++ netlib.source += [
++ '../posix/JackNetUnixSocket.cpp',
++ '../posix/JackPosixThread.cpp',
++ '../posix/JackPosixMutex.cpp',
++ '../netbsd/JackNetBSDTime.c'
++ ]
+ netlib.env.append_value('CPPFLAGS', '-fvisibility=hidden')
+
- if bld.env['IS_SUN']:
- netlib.source += ['../posix/JackNetUnixSocket.cpp','../posix/JackPosixThread.cpp', '../posix/JackPosixMutex.cpp', '../solaris/JackSolarisTime.c']
+ if bld.env['IS_FREEBSD']:
+ netlib.source += [
+ '../posix/JackNetUnixSocket.cpp',
+@@ -420,6 +470,8 @@ def build(bld):
Home |
Main Index |
Thread Index |
Old Index