|
 |
5d94ff |
From 26e63ca2e1d71491cd4e459b8890607b4a4bdd83 Mon Sep 17 00:00:00 2001
|
|
|
dcb197 |
From: Wim Taymans <wtaymans@redhat.com>
|
|
|
5d94ff |
Date: Fri, 18 Feb 2022 10:14:11 +0100
|
|
|
dcb197 |
Subject: [PATCH] jack: allow build on old meson of jack.pc
|
|
|
dcb197 |
|
|
|
dcb197 |
Warn about reduced functionality.
|
|
|
dcb197 |
---
|
|
|
5d94ff |
pipewire-jack/src/meson.build | 32 ++++++++++++++++++++------------
|
|
|
5d94ff |
1 file changed, 20 insertions(+), 12 deletions(-)
|
|
|
dcb197 |
|
|
|
dcb197 |
diff --git a/pipewire-jack/src/meson.build b/pipewire-jack/src/meson.build
|
|
|
5d94ff |
index bb1a7f0e9..4dfae3d39 100644
|
|
|
dcb197 |
--- a/pipewire-jack/src/meson.build
|
|
|
dcb197 |
+++ b/pipewire-jack/src/meson.build
|
|
|
5d94ff |
@@ -69,21 +69,29 @@ pipewire_jacknet = shared_library('jacknet',
|
|
|
dcb197 |
|
|
|
dcb197 |
if get_option('jack-devel') == true
|
|
|
dcb197 |
if meson.version().version_compare('<0.59.0')
|
|
|
dcb197 |
- error(
|
|
|
dcb197 |
+ warning(
|
|
|
dcb197 |
'''
|
|
|
dcb197 |
- Before version 0.59.0 Meson creates a wrong jack pkg-config file.
|
|
|
dcb197 |
- For that reason this is now an error. Please update Meson,
|
|
|
dcb197 |
- if you want to have JACK development files.
|
|
|
dcb197 |
+ Before version 0.59.0 Meson creates a wrong jack pkg-config file
|
|
|
5d94ff |
+ for server development. Please update Meson, if you want to have
|
|
|
5d94ff |
+ JACK development files for server.
|
|
|
dcb197 |
''')
|
|
|
5d94ff |
- endif
|
|
|
5d94ff |
|
|
|
5d94ff |
- pkgconfig.generate(filebase : 'jack',
|
|
|
5d94ff |
- libraries : [pipewire_jack, pipewire_jackserver],
|
|
|
5d94ff |
- name : 'jack',
|
|
|
5d94ff |
- description : 'PipeWire JACK API',
|
|
|
5d94ff |
- version : '1.9.17',
|
|
|
5d94ff |
- extra_cflags : '-D_REENTRANT',
|
|
|
5d94ff |
- unescaped_variables: ['server_libs=-L${libdir} -ljackserver', 'jack_implementation=pipewire'])
|
|
|
dcb197 |
+ pkgconfig.generate(filebase : 'jack',
|
|
|
dcb197 |
+ libraries : [pipewire_jack, pipewire_jackserver],
|
|
|
dcb197 |
+ name : 'jack',
|
|
|
dcb197 |
+ description : 'PipeWire JACK API',
|
|
|
dcb197 |
+ version : '1.9.17',
|
|
|
dcb197 |
+ extra_cflags : '-D_REENTRANT',
|
|
|
5d94ff |
+ variables: ['server_libs=-L${libdir} -ljackserver', 'jack_implementation=pipewire'])
|
|
|
dcb197 |
+ else
|
|
|
dcb197 |
+ pkgconfig.generate(filebase : 'jack',
|
|
|
dcb197 |
+ libraries : [pipewire_jack, pipewire_jackserver],
|
|
|
dcb197 |
+ name : 'jack',
|
|
|
dcb197 |
+ description : 'PipeWire JACK API',
|
|
|
dcb197 |
+ version : '1.9.17',
|
|
|
dcb197 |
+ extra_cflags : '-D_REENTRANT',
|
|
|
5d94ff |
+ unescaped_variables: ['server_libs=-L${libdir} -ljackserver', 'jack_implementation=pipewire'])
|
|
|
5d94ff |
+ endif
|
|
|
dcb197 |
endif
|
|
|
dcb197 |
|
|
|
dcb197 |
if sdl_dep.found()
|
|
|
dcb197 |
--
|
|
|
5d94ff |
2.34.1
|
|
|
dcb197 |
|