package/jack2: bump to version 1.9.22

- Drop patch (already in version)
- tools option has been dropped since
  564c710eef
- sndfile is not a dependency since
  c69d6097c2
- readline is not a dependency since
  a0b3e3e4dd

https://github.com/jackaudio/jack2/blob/v1.9.22/ChangeLog.rst

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2023-12-08 20:13:44 +01:00 committed by Peter Korsgaard
parent 41cc3b3a3f
commit 1de7de1571
4 changed files with 3 additions and 73 deletions

View File

@ -592,7 +592,6 @@ package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch Up
package/irrlicht/0002-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch Upstream
package/iucode-tool/S00iucode-tool Variables
package/iwd/S40iwd Shellcheck Variables
package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch Upstream
package/janus-gateway/0001-disable-ssp.patch Upstream
package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch Upstream
package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch Upstream

View File

@ -1,55 +0,0 @@
From 328c58967dce8be426f9208ba7717ab5afc2c4f3 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 11 Jul 2022 00:56:28 +0200
Subject: [PATCH] Remove usage of 'U' mode bit for opening files in python
The 'U' mode bit is removed in python 3.11. It has been
deprecated for a long time. The 'U' mode bit has no effect
so this change doesn't change any behavior.
See https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
waflib/ConfigSet.py | 2 +-
waflib/Context.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py
index b300bb56..84736c9c 100644
--- 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))
diff --git a/waflib/Context.py b/waflib/Context.py
index 9fee3fa1..761b521f 100644
--- 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)
--
2.30.2

View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 8b044a40ba5393b47605a920ba30744fdf8bf77d210eca90d39c8637fe6bc65d jack2-1.9.21.tar.gz
sha256 1e42b9fc4ad7db7befd414d45ab2f8a159c0b30fcd6eee452be662298766a849 jack2-1.9.22.tar.gz
sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING

View File

@ -4,7 +4,7 @@
#
################################################################################
JACK2_VERSION = 1.9.21
JACK2_VERSION = 1.9.22
JACK2_SITE = $(call github,jackaudio,jack2,v$(JACK2_VERSION))
JACK2_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library)
JACK2_LICENSE_FILES = COPYING
@ -12,7 +12,7 @@ JACK2_CPE_ID_VENDOR = jackaudio
JACK2_DEPENDENCIES = host-pkgconf alsa-lib
JACK2_INSTALL_STAGING = YES
JACK2_CONF_OPTS = --alsa --example-tools=no
JACK2_CONF_OPTS = --alsa
ifeq ($(BR2_PACKAGE_LIBEXECINFO),y)
JACK2_DEPENDENCIES += libexecinfo
@ -26,13 +26,6 @@ else
JACK2_CONF_OPTS += --samplerate=no
endif
ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
JACK2_DEPENDENCIES += libsndfile
JACK2_CONF_OPTS += --sndfile=yes
else
JACK2_CONF_OPTS += --sndfile=no
endif
ifeq ($(BR2_PACKAGE_OPUS),y)
JACK2_DEPENDENCIES += opus
JACK2_CONF_OPTS += --opus=yes
@ -40,13 +33,6 @@ else
JACK2_CONF_OPTS += --opus=no
endif
ifeq ($(BR2_PACKAGE_READLINE),y)
JACK2_DEPENDENCIES += readline
JACK2_CONF_OPTS += --readline=yes
else
JACK2_CONF_OPTS += --readline=no
endif
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
JACK2_DEPENDENCIES += systemd
JACK2_CONF_OPTS += --systemd=yes