CVS commit: pkgsrc/audio/jack

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Aug 15 18:05:05 UTC 2024

Modified Files:
        pkgsrc/audio/jack: Makefile distinfo
        pkgsrc/audio/jack/patches: patch-waflib_Context.py

Log Message:
jack: fix build w/ Python 3.12 (cherry-picked from upstream)


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/audio/jack/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/audio/jack/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/jack/patches/patch-waflib_Context.py

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.58 pkgsrc/audio/jack/Makefile:1.59
--- pkgsrc/audio/jack/Makefile:1.58     Thu Nov 23 16:30:30 2023
+++ pkgsrc/audio/jack/Makefile  Thu Aug 15 18:05:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2023/11/23 16:30:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.59 2024/08/15 18:05:05 tnn Exp $
 
 DISTNAME=      jack2-1.9.21
 PKGNAME=       ${DISTNAME:S/jack2/jack/1}
@@ -53,7 +53,7 @@ post-install:
 
 REPLACE_PYTHON+=       waf
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27 312
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 PKGCONFIG_OVERRIDE+=           jack.pc.in
 

Index: pkgsrc/audio/jack/distinfo
diff -u pkgsrc/audio/jack/distinfo:1.35 pkgsrc/audio/jack/distinfo:1.36
--- pkgsrc/audio/jack/distinfo:1.35     Sat Jan  7 21:20:19 2023
+++ pkgsrc/audio/jack/distinfo  Thu Aug 15 18:05:05 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2023/01/07 21:20:19 triaxx Exp $
+$NetBSD: distinfo,v 1.36 2024/08/15 18:05:05 tnn Exp $
 
 BLAKE2s (jack2-1.9.21.tar.gz) = c4f0db4449051bad70a61ab62e67eea5874457459ad6d6866cf4b1efb127119c
 SHA512 (jack2-1.9.21.tar.gz) = 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557
@@ -24,5 +24,5 @@ SHA1 (patch-posix_JackSocket.cpp) = 88ae
 SHA1 (patch-tests_wscript) = d79f0c5fefed422c36a3571fce7188a799e57a5d
 SHA1 (patch-tools_wscript) = 67c4b8d4162c3bce737fcb5ee69314b4f6833fc1
 SHA1 (patch-waflib_ConfigSet.py) = 8f4cf15e16dae9f64ee7d5f65fe8c633cea7d1c0
-SHA1 (patch-waflib_Context.py) = b68ec440239d877680e1425907a42f8412f7e7da
+SHA1 (patch-waflib_Context.py) = ca92ee0486ca67463ffaa77b59fe86888ef0580f
 SHA1 (patch-wscript) = 758ac2e0519d3529e2d5a7214ce1c12a10a5f397

Index: pkgsrc/audio/jack/patches/patch-waflib_Context.py
diff -u pkgsrc/audio/jack/patches/patch-waflib_Context.py:1.1 pkgsrc/audio/jack/patches/patch-waflib_Context.py:1.2
--- pkgsrc/audio/jack/patches/patch-waflib_Context.py:1.1       Fri Dec 16 07:36:41 2022
+++ pkgsrc/audio/jack/patches/patch-waflib_Context.py   Thu Aug 15 18:05:05 2024
@@ -1,11 +1,31 @@
-$NetBSD: patch-waflib_Context.py,v 1.1 2022/12/16 07:36:41 wiz Exp $
+$NetBSD: patch-waflib_Context.py,v 1.2 2024/08/15 18:05:05 tnn Exp $
 
-Fix build with Python 3.11.
+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     2021-07-15 06:18:26.000000000 +0000
+--- waflib/Context.py.orig     2022-04-15 19:14:06.000000000 +0000
 +++ waflib/Context.py
-@@ -266,7 +266,7 @@ class Context(ctx):
+@@ -6,10 +6,17 @@
+ Classes and functions enabling the command system
+ """
+ 
+-import os, re, imp, sys
++import os, re, sys
+ 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:
@@ -14,7 +34,7 @@ https://github.com/jackaudio/jack2/issue
                                        exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict)
                                finally:
                                        self.post_recurse(node)
-@@ -662,7 +662,7 @@ def load_module(path, encoding=None):
+@@ -662,7 +669,7 @@ def load_module(path, encoding=None):
  
        module = imp.new_module(WSCRIPT_FILE)
        try: