From bd397f1f1cdadf793b6d84fd72693cb2cb4004e6 Mon Sep 17 00:00:00 2001
From: Guido Aulisi <guido.aulisi@gmail.com>
Date: Sun, 16 Jan 2022 21:56:20 +0100
Subject: [PATCH] Update to 1.9.20

Build zalsa internal client
---
 .gitignore                                    |  1 +
 ...nnection-kit-example-tools-man-pages.patch | 27 +++++++++++++++++++
 jack-audio-connection-kit.spec                | 14 ++++++++--
 sources                                       |  2 +-
 4 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 jack-audio-connection-kit-example-tools-man-pages.patch

diff --git a/.gitignore b/.gitignore
index df31070..d0b422f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ jack-1.9.5.tar.bz2
 /jack2-1.9.17.tar.gz
 /jack2-1.9.18.tar.gz
 /jack2-1.9.19.tar.gz
+/jack2-1.9.20.tar.gz
diff --git a/jack-audio-connection-kit-example-tools-man-pages.patch b/jack-audio-connection-kit-example-tools-man-pages.patch
new file mode 100644
index 0000000..8b37eb0
--- /dev/null
+++ b/jack-audio-connection-kit-example-tools-man-pages.patch
@@ -0,0 +1,27 @@
+From f653c2d8e90a821538ae6fab68dccf4015c2d64f Mon Sep 17 00:00:00 2001
+From: Guido Aulisi <guido.aulisi@gmail.com>
+Date: Sun, 16 Jan 2022 21:24:18 +0100
+Subject: [PATCH] Fix build of jack-example-tools man pages
+
+Commit e8c0be1ce932bfb99fdd1a50e08fab187efed6ca changed the name
+of the configuration environment to build the jack-example-tools,
+but forgot to change it for man pages.
+---
+ man/wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/wscript b/man/wscript
+index 52270c33..691b05ab 100644
+--- a/man/wscript
++++ b/man/wscript
+@@ -5,6 +5,6 @@
+ def build(bld):
+     bld.exec_command('cd man ; sh fill_template {} {}'.format(
+         bld.env['JACK_VERSION'],
+-        bld.env['HAVE_JACK_EXAMPLE_TOOLS'])
++        bld.env['BUILD_JACK_EXAMPLE_TOOLS'])
+     )
+     bld.install_files(bld.env['MANDIR'], bld.path.ant_glob('*.1'))
+-- 
+2.34.1
+
diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec
index a998a36..3c051c5 100644
--- a/jack-audio-connection-kit.spec
+++ b/jack-audio-connection-kit.spec
@@ -13,7 +13,7 @@
 
 Summary:       The Jack Audio Connection Kit
 Name:          jack-audio-connection-kit
-Version:       1.9.19
+Version:       1.9.20
 Release:       1%{?dist}
 # The entire source (~500 files) is a mixture of these three licenses
 License:       GPLv2 and GPLv2+ and LGPLv2+
@@ -26,6 +26,8 @@ Source3:       %{name}-limits.conf
 Source4:       svnversion.h
 # Adjust default priority. RHBZ#795094
 Patch1:        jack-realtime-compat.patch
+# Patch sent upstream https://github.com/jackaudio/jack2/pull/836
+Patch2:        %{name}-example-tools-man-pages.patch
 
 BuildRequires: alsa-lib-devel
 BuildRequires: dbus-devel
@@ -46,6 +48,8 @@ BuildRequires: opus-devel
 BuildRequires: pkgconfig
 BuildRequires: python3
 BuildRequires: readline-devel
+BuildRequires: zita-alsa-pcmi-devel
+BuildRequires: zita-resampler-devel
 
 Requires(pre): shadow-utils
 Requires:      pam
@@ -104,7 +108,9 @@ python3 ./waf configure \
 %endif
    --alsa \
    --clients 256 \
-   --ports-per-application=2048
+   --ports-per-application=2048 \
+   --example-tools=yes \
+   --zalsa=yes
 
 python3 ./waf build %{?_smp_mflags} -v
 
@@ -233,6 +239,10 @@ exit 0
 
 
 %changelog
+* Sun Jan 16 2022 Guido Aulisi <guido.aulisi@gmail.com> - 1.9.20-1
+- Update to 1.9.20
+- Build zalsa internal client
+
 * Sat Jul 24 2021 Guido Aulisi <guido.aulisi@gmail.com> - 1.9.19-1
 - Update to 1.9.19
 
diff --git a/sources b/sources
index 5764a41..e8382a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jack2-1.9.19.tar.gz) = d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d
+SHA512 (jack2-1.9.20.tar.gz) = e4bffea5fadcf6fc8a40bb88b6f7266bc42d8fa743d5e00be786df00b19b9e02e42ce6cb5db3a9523eb3b2bc319234ac33c00b2c1e2ac7d1c875890d55da30b4