CVS commit: pkgsrc/audio/jack

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jun  6 23:03:39 UTC 2025

Modified Files:
        pkgsrc/audio/jack: Makefile PLIST buildlink3.mk distinfo platform.mk
        pkgsrc/audio/jack/patches: patch-waflib_Context.py patch-wscript
Removed Files:
        pkgsrc/audio/jack/patches: patch-example-clients_wscript
            patch-tools_wscript patch-waflib_ConfigSet.py

Log Message:
jack: update to 1.9.22.

* 1.9.22 (2023-02-02)

  * The waf autooption ``--example-tools`` has been removed.
    The example clients and tools are no longer part of the jack2 project.
  * Drop dependencies that were only used for example clients and tools (readline, sndfile and zita libs)
  * Fix build with python3.11+
  * Fix compatibility with macOS 12+
  * Fix ringbuffer thread safety on ARM


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/audio/jack/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/audio/jack/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/audio/jack/buildlink3.mk
cvs rdiff -u -r1.36 -r1.37 pkgsrc/audio/jack/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/jack/platform.mk
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/audio/jack/patches/patch-example-clients_wscript
cvs rdiff -u -r1.4 -r0 pkgsrc/audio/jack/patches/patch-tools_wscript
cvs rdiff -u -r1.1 -r0 pkgsrc/audio/jack/patches/patch-waflib_ConfigSet.py
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/jack/patches/patch-waflib_Context.py
cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/jack/patches/patch-wscript

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/jack/Makefile
diff -u pkgsrc/audio/jack/Makefile:1.61 pkgsrc/audio/jack/Makefile:1.62
--- pkgsrc/audio/jack/Makefile:1.61     Wed Feb 12 06:44:23 2025
+++ pkgsrc/audio/jack/Makefile  Fri Jun  6 23:03:39 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2025/02/12 06:44:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.62 2025/06/06 23:03:39 wiz Exp $
 
-DISTNAME=      jack2-1.9.21
+DISTNAME=      jack2-1.9.22
 PKGNAME=       ${DISTNAME:S/jack2/jack/1}
-PKGREVISION=   4
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jackaudio/}
 GITHUB_PROJECT=        jack2
@@ -17,8 +16,6 @@ USE_LANGUAGES=        c c++
 USE_TOOLS+=    pkg-config bash
 
 WAF_ARGS+=     --systemd=no
-WAF_ARGS+=     --readline=no
-WAF_ARGS+=     --example-tools=yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -67,6 +64,4 @@ PKGCONFIG_OVERRIDE+=          jack.pc.in
 .endif
 .include "../../audio/libopus/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
-.include "../../audio/libsndfile/buildlink3.mk"
-#.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/jack/PLIST
diff -u pkgsrc/audio/jack/PLIST:1.17 pkgsrc/audio/jack/PLIST:1.18
--- pkgsrc/audio/jack/PLIST:1.17        Sun Jan  8 06:19:55 2023
+++ pkgsrc/audio/jack/PLIST     Fri Jun  6 23:03:39 2025
@@ -1,41 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2023/01/08 06:19:55 triaxx Exp $
-${PLIST.alsa}bin/alsa_in
-${PLIST.alsa}bin/alsa_out
-bin/jack_alias
-bin/jack_bufsize
-bin/jack_connect
-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_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
+@comment $NetBSD: PLIST,v 1.18 2025/06/06 23:03:39 wiz Exp $
 bin/jackd
 include/jack/control.h
 include/jack/intclient.h
@@ -55,7 +18,6 @@ include/jack/uuid.h
 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
@@ -81,25 +43,4 @@ lib/libjackserver.so
 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

Index: pkgsrc/audio/jack/buildlink3.mk
diff -u pkgsrc/audio/jack/buildlink3.mk:1.20 pkgsrc/audio/jack/buildlink3.mk:1.21
--- pkgsrc/audio/jack/buildlink3.mk:1.20        Wed Feb 12 06:44:23 2025
+++ pkgsrc/audio/jack/buildlink3.mk     Fri Jun  6 23:03:39 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2025/02/12 06:44:23 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2025/06/06 23:03:39 wiz Exp $
 
 BUILDLINK_TREE+=       jack
 
@@ -15,7 +15,6 @@ BUILDLINK_PKGSRCDIR.jack?=    ../../audio/j
 .endif
 .include "../../audio/libopus/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
-.include "../../audio/libsndfile/buildlink3.mk"
 .endif # JACK_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -jack

Index: pkgsrc/audio/jack/distinfo
diff -u pkgsrc/audio/jack/distinfo:1.36 pkgsrc/audio/jack/distinfo:1.37
--- pkgsrc/audio/jack/distinfo:1.36     Thu Aug 15 18:05:05 2024
+++ pkgsrc/audio/jack/distinfo  Fri Jun  6 23:03:39 2025
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.36 2024/08/15 18:05:05 tnn Exp $
+$NetBSD: distinfo,v 1.37 2025/06/06 23:03:39 wiz Exp $
 
-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
+BLAKE2s (jack2-1.9.22.tar.gz) = 7fb0da036d729eb2814b8003e73e44ed46f43f7243b164bc8799c9156717e7f3
+SHA512 (jack2-1.9.22.tar.gz) = d93cb2bcc57b72b6815eed143de1092d14fe22542ae9a1f8480d9ed5f44b59c50f81279d18bdd84ff6276ddd71ca1aa64a1e46d61199a5eda0d873a356194ab4
+Size (jack2-1.9.22.tar.gz) = 933448 bytes
 SHA1 (patch-common_JackAudioAdapterFactory.cpp) = b66c601cfcd565dbabcbac4747f9d1b17a2241ff
 SHA1 (patch-common_memops.c) = 468476c6067595524f492d37f3b761af48e78585
 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
@@ -22,7 +21,5 @@ SHA1 (patch-posix_JackPosixSemaphore.cpp
 SHA1 (patch-posix_JackPosixThread.h) = 0aa94425ad44cc36fb583e48bdfa9f5f33a5eaa3
 SHA1 (patch-posix_JackSocket.cpp) = 88ae18c3d2cc31a43355ff9b0c78ab13b83bd314
 SHA1 (patch-tests_wscript) = d79f0c5fefed422c36a3571fce7188a799e57a5d
-SHA1 (patch-tools_wscript) = 67c4b8d4162c3bce737fcb5ee69314b4f6833fc1
-SHA1 (patch-waflib_ConfigSet.py) = 8f4cf15e16dae9f64ee7d5f65fe8c633cea7d1c0
-SHA1 (patch-waflib_Context.py) = ca92ee0486ca67463ffaa77b59fe86888ef0580f
-SHA1 (patch-wscript) = 758ac2e0519d3529e2d5a7214ce1c12a10a5f397
+SHA1 (patch-waflib_Context.py) = 83ee99de6c2fd92a070e40ea2d96b5fa4c4b1596
+SHA1 (patch-wscript) = 5be2296b7598de17403847785614ca9fdd0d2d28

Index: pkgsrc/audio/jack/platform.mk
diff -u pkgsrc/audio/jack/platform.mk:1.5 pkgsrc/audio/jack/platform.mk:1.6
--- pkgsrc/audio/jack/platform.mk:1.5   Sat Jan  7 21:20:19 2023
+++ pkgsrc/audio/jack/platform.mk       Fri Jun  6 23:03:39 2025
@@ -1,20 +1,20 @@
-# $NetBSD: platform.mk,v 1.5 2023/01/07 21:20:19 triaxx Exp $
+# $NetBSD: platform.mk,v 1.6 2025/06/06 23:03:39 wiz Exp $
 
 .if !defined(PLATFORM_SUPPORTS_JACK)
-.  include "../../mk/bsd.fast.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 JACK_PLATFORMS+=       Darwin-*-*
 JACK_PLATFORMS+=       Linux-*-*
 
-.  if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
 PLATFORM_SUPPORTS_JACK=        yes
-.  endif
+.endif
 
-.  for jack_platform in ${JACK_PLATFORMS}
-.    if !empty(MACHINE_PLATFORM:M${jack_platform})
+.for jack_platform in ${JACK_PLATFORMS}
+.  if !empty(MACHINE_PLATFORM:M${jack_platform})
 PLATFORM_SUPPORTS_JACK=        yes
-.    endif
-.  endfor
+.  endif
+.endfor
 
 PLATFORM_SUPPORTS_JACK?=       no
 

Index: pkgsrc/audio/jack/patches/patch-waflib_Context.py
diff -u pkgsrc/audio/jack/patches/patch-waflib_Context.py:1.2 pkgsrc/audio/jack/patches/patch-waflib_Context.py:1.3
--- pkgsrc/audio/jack/patches/patch-waflib_Context.py:1.2       Thu Aug 15 18:05:05 2024
+++ pkgsrc/audio/jack/patches/patch-waflib_Context.py   Fri Jun  6 23:03:39 2025
@@ -1,45 +1,26 @@
-$NetBSD: patch-waflib_Context.py,v 1.2 2024/08/15 18:05:05 tnn Exp $
+$NetBSD: patch-waflib_Context.py,v 1.3 2025/06/06 23:03:39 wiz Exp $
 
 Fix build with Python 3.11, 3.12.
 https://github.com/jackaudio/jack2/issues/898
 https://github.com/jackaudio/jack2/commit/250420381b1a6974798939ad7104ab1a4b9a9994#diff-5cdadb9cd9b71f7c6dda6ca75241b1968009f71cd7c046242929974b61cff061L12
 
---- waflib/Context.py.orig     2022-04-15 19:14:06.000000000 +0000
+--- waflib/Context.py.orig     2025-06-06 23:01:28.513361828 +0000
 +++ waflib/Context.py
-@@ -6,10 +6,17 @@
+@@ -6,7 +6,7 @@
  Classes and functions enabling the command system
  """
  
 -import os, re, imp, sys
-+import os, re, sys
++import os, re, sys, types
  from waflib import Utils, Errors, Logs
  import waflib.Node
  
-+if sys.hexversion > 0x3040000:
-+      import types
-+      class imp(object):
-+              new_module = lambda x: types.ModuleType(x)
-+else:
-+      import imp
-+
- # the following 3 constants are updated on each new release (do not touch)
- HEXVERSION=0x2000c00
- """Constant updated on new releases"""
-@@ -266,7 +273,7 @@ class Context(ctx):
-                               cache[node] = True
-                               self.pre_recurse(node)
-                               try:
--                                      function_code = node.read('rU', encoding)
-+                                      function_code = node.read('r', encoding)
-                                       exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict)
-                               finally:
-                                       self.post_recurse(node)
-@@ -662,7 +669,7 @@ def load_module(path, encoding=None):
+@@ -660,7 +660,7 @@ def load_module(path, encoding=None):
+       except KeyError:
+               pass
  
-       module = imp.new_module(WSCRIPT_FILE)
+-      module = imp.new_module(WSCRIPT_FILE)
++      module = module = types.ModuleType(WSCRIPT_FILE)
        try:
--              code = Utils.readf(path, m='rU', encoding=encoding)
-+              code = Utils.readf(path, m='r', encoding=encoding)
+               code = Utils.readf(path, m='r', encoding=encoding)
        except EnvironmentError:
-               raise Errors.WafError('Could not read the file %r' % path)
- 

Index: pkgsrc/audio/jack/patches/patch-wscript
diff -u pkgsrc/audio/jack/patches/patch-wscript:1.5 pkgsrc/audio/jack/patches/patch-wscript:1.6
--- pkgsrc/audio/jack/patches/patch-wscript:1.5 Sat Jan  7 21:20:19 2023
+++ pkgsrc/audio/jack/patches/patch-wscript     Fri Jun  6 23:03:39 2025
@@ -1,11 +1,11 @@
-$NetBSD: patch-wscript,v 1.5 2023/01/07 21:20:19 triaxx Exp $
+$NetBSD: patch-wscript,v 1.6 2025/06/06 23:03:39 wiz Exp $
 
 - Add NetBSD support.
 - Ensure man pages are installed on all Unixes.
 
---- wscript.orig       2022-04-15 19:14:06.000000000 +0000
+--- wscript.orig       2023-02-02 11:04:10.000000000 +0000
 +++ wscript
-@@ -234,6 +234,7 @@ def detect_platform(conf):
+@@ -216,6 +216,7 @@ def detect_platform(conf):
          ('IS_LINUX',   'Linux',   ['gnu0', 'gnukfreebsd', 'linux', 'posix']),
          ('IS_FREEBSD', 'FreeBSD', ['freebsd']),
          ('IS_MACOSX',  'MacOS X', ['darwin']),
@@ -13,7 +13,7 @@ $NetBSD: patch-wscript,v 1.5 2023/01/07 
          ('IS_SUN',     'SunOS',   ['sunos']),
          ('IS_WINDOWS', 'Windows', ['cygwin', 'msys', 'win32'])
      ]
-@@ -276,6 +277,11 @@ def configure(conf):
+@@ -258,6 +259,11 @@ def configure(conf):
          conf.check(lib='execinfo', uselib='EXECINFO', define_name='EXECINFO')
          conf.check_cfg(package='libsysinfo', args='--cflags --libs')
  
@@ -25,7 +25,7 @@ $NetBSD: patch-wscript,v 1.5 2023/01/07 
      if not conf.env['IS_MACOSX']:
          conf.env.append_unique('LDFLAGS', '-Wl,--no-undefined')
      else:
-@@ -568,6 +574,9 @@ def obj_add_includes(bld, obj):
+@@ -546,6 +552,9 @@ def obj_add_includes(bld, obj):
      if bld.env['IS_SUN']:
          obj.includes += ['posix', 'solaris']
  
@@ -35,7 +35,7 @@ $NetBSD: patch-wscript,v 1.5 2023/01/07 
      if bld.env['IS_WINDOWS']:
          obj.includes += ['windows']
  
-@@ -624,6 +633,10 @@ def create_driver_obj(bld, **kw):
+@@ -602,6 +611,10 @@ def create_driver_obj(bld, **kw):
      else:
          driver.env['cxxshlib_PATTERN'] = 'jack_%s.so'
  
@@ -46,7 +46,7 @@ $NetBSD: patch-wscript,v 1.5 2023/01/07 
      obj_add_includes(bld, driver)
  
      return driver
-@@ -726,6 +739,11 @@ def build_drivers(bld):
+@@ -704,6 +717,11 @@ def build_drivers(bld):
          'windows/portaudio/JackPortAudioDriver.cpp',
      ]
  
@@ -58,7 +58,7 @@ $NetBSD: patch-wscript,v 1.5 2023/01/07 
      winmme_src = [
          'windows/winmme/JackWinMMEDriver.cpp',
          'windows/winmme/JackWinMMEInputPort.cpp',
-@@ -834,6 +852,11 @@ def build_drivers(bld):
+@@ -812,6 +830,11 @@ def build_drivers(bld):
              target='oss',
              source=oss_src)
  
@@ -70,15 +70,13 @@ $NetBSD: patch-wscript,v 1.5 2023/01/07 
  
  def build(bld):
      if not bld.variant and bld.env['BUILD_WITH_32_64']:
-@@ -858,9 +881,10 @@ def build(bld):
-         bld.recurse('tools')
+@@ -831,8 +854,8 @@ def build(bld):
  
+     build_drivers(bld)
+ 
++    bld.recurse('man')
      if bld.env['IS_LINUX'] or bld.env['IS_FREEBSD']:
 -        bld.recurse('man')
          bld.recurse('systemd')
-     if not bld.env['IS_WINDOWS'] and bld.env['BUILD_JACK_EXAMPLE_TOOLS']:
-+        bld.recurse('man')
-+    if not bld.env['IS_WINDOWS'] and bld.env['BUILD_JACK_EXAMPLE_TOOLS']:
+     if not bld.env['IS_WINDOWS'] and bld.env['BUILD_TESTS']:
          bld.recurse('tests')
-     if bld.env['BUILD_JACKDBUS']:
-         bld.recurse('dbus')