summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2023-02-18 14:38:59 +0800
committerKhem Raj <raj.khem@gmail.com>2023-02-18 13:19:36 -0800
commitbcf592303c98b025086bd973626c784e5e6268f6 (patch)
tree1536288d3118813e721f356199eb2127b917b6c4
parente82c7e601e5cf0c83449383dba26cc53bc1982e4 (diff)
downloadmeta-openembedded-bcf592303c98b025086bd973626c784e5e6268f6.tar.gz
jack: upgrade 1.19.21 -> 1.19.22
0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch removed since it's included in 1.19.22. Changelog: ========== 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 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-multimedia/jack/jack/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch52
-rw-r--r--meta-oe/recipes-multimedia/jack/jack_1.19.22.bb (renamed from meta-oe/recipes-multimedia/jack/jack_1.19.21.bb)6
2 files changed, 2 insertions, 56 deletions
diff --git a/meta-oe/recipes-multimedia/jack/jack/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch b/meta-oe/recipes-multimedia/jack/jack/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch
deleted file mode 100644
index d3b203111f..0000000000
--- a/meta-oe/recipes-multimedia/jack/jack/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 415d50fc56b82963e5570c7738c61b22f4a83748 Mon Sep 17 00:00:00 2001
2From: Daan De Meyer <daan.j.demeyer@gmail.com>
3Date: Mon, 11 Jul 2022 00:56:28 +0200
4Subject: [PATCH] Remove usage of 'U' mode bit for opening files in python
5
6The 'U' mode bit is removed in python 3.11. It has been
7deprecated for a long time. The 'U' mode bit has no effect
8so this change doesn't change any behavior.
9
10See https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
11
12Upstream-Status: Submitted [https://github.com/jackaudio/jack2/pull/884]
13---
14 waflib/ConfigSet.py | 2 +-
15 waflib/Context.py | 4 ++--
16 2 files changed, 3 insertions(+), 3 deletions(-)
17
18diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py
19index b300bb56..84736c9c 100644
20--- a/waflib/ConfigSet.py
21+++ b/waflib/ConfigSet.py
22@@ -312,7 +312,7 @@ class ConfigSet(object):
23 :type filename: string
24 """
25 tbl = self.table
26- code = Utils.readf(filename, m='rU')
27+ code = Utils.readf(filename, m='r')
28 for m in re_imp.finditer(code):
29 g = m.group
30 tbl[g(2)] = eval(g(3))
31diff --git a/waflib/Context.py b/waflib/Context.py
32index 9fee3fa1..761b521f 100644
33--- a/waflib/Context.py
34+++ b/waflib/Context.py
35@@ -266,7 +266,7 @@ class Context(ctx):
36 cache[node] = True
37 self.pre_recurse(node)
38 try:
39- function_code = node.read('rU', encoding)
40+ function_code = node.read('r', encoding)
41 exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict)
42 finally:
43 self.post_recurse(node)
44@@ -662,7 +662,7 @@ def load_module(path, encoding=None):
45
46 module = imp.new_module(WSCRIPT_FILE)
47 try:
48- code = Utils.readf(path, m='rU', encoding=encoding)
49+ code = Utils.readf(path, m='r', encoding=encoding)
50 except EnvironmentError:
51 raise Errors.WafError('Could not read the file %r' % path)
52
diff --git a/meta-oe/recipes-multimedia/jack/jack_1.19.21.bb b/meta-oe/recipes-multimedia/jack/jack_1.19.22.bb
index 808b8259f0..b85b7993d0 100644
--- a/meta-oe/recipes-multimedia/jack/jack_1.19.21.bb
+++ b/meta-oe/recipes-multimedia/jack/jack_1.19.22.bb
@@ -14,10 +14,8 @@ LIC_FILES_CHKSUM = " \
14 14
15DEPENDS = "libsamplerate0 libsndfile1 readline" 15DEPENDS = "libsamplerate0 libsndfile1 readline"
16 16
17SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https \ 17SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https"
18 file://0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch \ 18SRCREV = "4f58969432339a250ce87fe855fb962c67d00ddb"
19"
20SRCREV = "6b3c96d8aeef8aeb4b20f3aa647e6d01b4000ff8"
21 19
22S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"
23 21