59 lines
2.0 KiB
Diff
59 lines
2.0 KiB
Diff
|
From dda2edc0641b57cd0315806a746c787e2c40cefb Mon Sep 17 00:00:00 2001
|
||
|
|
From: Wim Taymans <wtaymans@redhat.com>
|
||
|
|
Date: Mon, 15 Nov 2021 10:57:22 +0100
|
||
|
|
Subject: [PATCH] jack: allow build on old meson of jack.pc
|
||
|
|
|
||
|
|
Warn about reduced functionality.
|
||
|
|
---
|
||
|
|
pipewire-jack/src/meson.build | 31 +++++++++++++++++++------------
|
||
|
|
1 file changed, 19 insertions(+), 12 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/pipewire-jack/src/meson.build b/pipewire-jack/src/meson.build
|
||
|
|
index cdc147ba4..3709070e1 100644
|
||
|
|
--- a/pipewire-jack/src/meson.build
|
||
|
|
+++ b/pipewire-jack/src/meson.build
|
||
|
|
@@ -71,21 +71,28 @@ pipewire_jackserver = shared_library('jacknet',
|
||
|
|
|
||
|
|
if get_option('jack-devel') == true
|
||
|
|
if meson.version().version_compare('<0.59.0')
|
||
|
|
- error(
|
||
|
|
+ warning(
|
||
|
|
'''
|
||
|
|
- Before version 0.59.0 Meson creates a wrong jack pkg-config file.
|
||
|
|
- For that reason this is now an error. Please update Meson,
|
||
|
|
- if you want to have JACK development files.
|
||
|
|
+ Before version 0.59.0 Meson creates a wrong jack pkg-config file
|
||
|
|
+ for server development. Please update Meson, if you want to have
|
||
|
|
+ JACK development files for server.
|
||
|
|
''')
|
||
|
|
+ pkgconfig.generate(filebase : 'jack',
|
||
|
|
+ libraries : [pipewire_jack, pipewire_jackserver],
|
||
|
|
+ name : 'jack',
|
||
|
|
+ description : 'PipeWire JACK API',
|
||
|
|
+ version : '1.9.17',
|
||
|
|
+ extra_cflags : '-D_REENTRANT',
|
||
|
|
+ variables: ['server_libs=-L${libdir} -ljackserver'])
|
||
|
|
+ else
|
||
|
|
+ pkgconfig.generate(filebase : 'jack',
|
||
|
|
+ libraries : [pipewire_jack, pipewire_jackserver],
|
||
|
|
+ name : 'jack',
|
||
|
|
+ description : 'PipeWire JACK API',
|
||
|
|
+ version : '1.9.17',
|
||
|
|
+ extra_cflags : '-D_REENTRANT',
|
||
|
|
+ unescaped_variables: ['server_libs=-L${libdir} -ljackserver'])
|
||
|
|
endif
|
||
|
|
-
|
||
|
|
- pkgconfig.generate(filebase : 'jack',
|
||
|
|
- libraries : [pipewire_jack, pipewire_jackserver],
|
||
|
|
- name : 'jack',
|
||
|
|
- description : 'PipeWire JACK API',
|
||
|
|
- version : '1.9.17',
|
||
|
|
- extra_cflags : '-D_REENTRANT',
|
||
|
|
- unescaped_variables: ['server_libs=-L${libdir} -ljackserver'])
|
||
|
|
endif
|
||
|
|
|
||
|
|
if sdl_dep.found()
|
||
|
|
--
|
||
|
|
GitLab
|
||
|
|
|