From 2adc9938bb1c3958fa2fc9c322d60627dd7fce6e Mon Sep 17 00:00:00 2001 From: triallax Date: Wed, 14 Jun 2023 19:04:56 +0100 Subject: [PATCH] jack: update to 1.9.22. --- srcpkgs/jack/patches/python3.11.patch | 36 --------------------------- srcpkgs/jack/template | 14 +++++------ 2 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 srcpkgs/jack/patches/python3.11.patch diff --git a/srcpkgs/jack/patches/python3.11.patch b/srcpkgs/jack/patches/python3.11.patch deleted file mode 100644 index 5b52a9bfb43f..000000000000 --- a/srcpkgs/jack/patches/python3.11.patch +++ /dev/null @@ -1,36 +0,0 @@ -U is included by default and deprecated since 3.3 and an error since 3.11 - -https://github.com/jackaudio/jack2/issues/898 -adapted from https://gitweb.gentoo.org/repo/gentoo.git/tree/media-sound/jack2/files/jack2-1.9.21-python3.11.patch - ---- a/waflib/ConfigSet.py -+++ b/waflib/ConfigSet.py -@@ -312,7 +312,7 @@ class ConfigSet(object): - :type filename: string - """ - tbl = self.table -- code = Utils.readf(filename, m='rU') -+ code = Utils.readf(filename, m='r') - for m in re_imp.finditer(code): - g = m.group - tbl[g(2)] = eval(g(3)) ---- a/waflib/Context.py -+++ b/waflib/Context.py -@@ -266,7 +266,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 +662,7 @@ def load_module(path, encoding=None): - - module = imp.new_module(WSCRIPT_FILE) - try: -- code = Utils.readf(path, m='rU', encoding=encoding) -+ code = Utils.readf(path, m='r', encoding=encoding) - except EnvironmentError: - raise Errors.WafError('Could not read the file %r' % path) - diff --git a/srcpkgs/jack/template b/srcpkgs/jack/template index 7e4de615e0ad..05c1ae08ce04 100644 --- a/srcpkgs/jack/template +++ b/srcpkgs/jack/template @@ -1,13 +1,12 @@ # Template file for 'jack' pkgname=jack -version=1.9.21 +version=1.9.22 revision=1 build_style=waf3 -configure_args="--alsa --classic --dbus --example-tools" +configure_args="--alsa --classic --dbus" hostmakedepends="pkg-config" -makedepends="eigen opus-devel libsamplerate-devel readline-devel - dbus-devel db-devel celt-devel $(vopt_if ffado libffado-devel) - $(vopt_if zalsa 'zita-alsa-pcmi-devel zita-resampler-devel')" +makedepends="eigen opus-devel libsamplerate-devel dbus-devel db-devel celt-devel + $(vopt_if ffado libffado-devel)" depends="python3-dbus" short_desc="JACK Audio Connection Kit low-latency sound server (pro audio)" maintainer="Orphaned " @@ -15,13 +14,12 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://jackaudio.org/" changelog="https://raw.githubusercontent.com/jackaudio/jack2/master/ChangeLog.rst" distfiles="https://github.com/jackaudio/jack2/archive/v${version}.tar.gz" -checksum=8b044a40ba5393b47605a920ba30744fdf8bf77d210eca90d39c8637fe6bc65d +checksum=1e42b9fc4ad7db7befd414d45ab2f8a159c0b30fcd6eee452be662298766a849 python_version=3 # Package build options -build_options="ffado zalsa" +build_options="ffado" desc_option_ffado="Enable support for FireWire audio devices" -desc_option_zalsa="Enable support for internal zita-a2j/j2a clients" post_install() { # pam_limits(8) support