Blob Blame History Raw
From 26e63ca2e1d71491cd4e459b8890607b4a4bdd83 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 18 Feb 2022 10:14:11 +0100
Subject: [PATCH] jack: allow build on old meson of jack.pc

Warn about reduced functionality.
---
 pipewire-jack/src/meson.build | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/pipewire-jack/src/meson.build b/pipewire-jack/src/meson.build
index bb1a7f0e9..4dfae3d39 100644
--- a/pipewire-jack/src/meson.build
+++ b/pipewire-jack/src/meson.build
@@ -69,21 +69,29 @@ pipewire_jacknet = 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.
           ''')
-  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', 'jack_implementation=pipewire'])
+    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', 'jack_implementation=pipewire'])
+  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', 'jack_implementation=pipewire'])
+  endif
 endif
 
 if sdl_dep.found()
-- 
2.34.1