67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
|
From 22551f32067ea5ff84cb58234eada45d9e4177c3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Wim Taymans <wtaymans@redhat.com>
|
||
|
|
Date: Tue, 19 May 2020 16:49:38 +0200
|
||
|
|
Subject: [PATCH] require meson 0.49
|
||
|
|
|
||
|
|
---
|
||
|
|
doc/meson.build | 3 +--
|
||
|
|
meson.build | 2 +-
|
||
|
|
pipewire-jack/src/meson.build | 1 -
|
||
|
|
pipewire-pulseaudio/src/meson.build | 1 -
|
||
|
|
4 files changed, 2 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/doc/meson.build b/doc/meson.build
|
||
|
|
index bf6c84c6..05c7ed35 100644
|
||
|
|
--- a/doc/meson.build
|
||
|
|
+++ b/doc/meson.build
|
||
|
|
@@ -22,8 +22,7 @@ doxyfile_conf.set('inputs', inputs)
|
||
|
|
|
||
|
|
doxyfile = configure_file(input: 'Doxyfile.in',
|
||
|
|
output: 'Doxyfile',
|
||
|
|
- configuration: doxyfile_conf,
|
||
|
|
- install: false)
|
||
|
|
+ configuration: doxyfile_conf)
|
||
|
|
|
||
|
|
docdir = join_paths(pipewire_datadir, 'doc')
|
||
|
|
|
||
|
|
diff --git a/meson.build b/meson.build
|
||
|
|
index 93fec84d..51171240 100644
|
||
|
|
--- a/meson.build
|
||
|
|
+++ b/meson.build
|
||
|
|
@@ -1,7 +1,7 @@
|
||
|
|
project('pipewire', ['c' ],
|
||
|
|
version : '0.3.5',
|
||
|
|
license : 'MIT',
|
||
|
|
- meson_version : '>= 0.50.0',
|
||
|
|
+ meson_version : '>= 0.49.0',
|
||
|
|
default_options : [ 'warning_level=3',
|
||
|
|
'c_std=gnu99',
|
||
|
|
'buildtype=debugoptimized' ])
|
||
|
|
diff --git a/pipewire-jack/src/meson.build b/pipewire-jack/src/meson.build
|
||
|
|
index e52349ed..23c2d8a2 100644
|
||
|
|
--- a/pipewire-jack/src/meson.build
|
||
|
|
+++ b/pipewire-jack/src/meson.build
|
||
|
|
@@ -28,7 +28,6 @@ tools_config.set('LIBJACK_PATH', libjack_path)
|
||
|
|
configure_file(input : 'pw-jack.in',
|
||
|
|
output : 'pw-jack',
|
||
|
|
configuration : tools_config,
|
||
|
|
- install: true,
|
||
|
|
install_dir : pipewire_bindir)
|
||
|
|
|
||
|
|
pipewire_jack = shared_library('jack',
|
||
|
|
diff --git a/pipewire-pulseaudio/src/meson.build b/pipewire-pulseaudio/src/meson.build
|
||
|
|
index f7e8ea6e..d700d2d9 100644
|
||
|
|
--- a/pipewire-pulseaudio/src/meson.build
|
||
|
|
+++ b/pipewire-pulseaudio/src/meson.build
|
||
|
|
@@ -59,7 +59,6 @@ tools_config.set('LIBPULSE_PATH', libpulse_path)
|
||
|
|
configure_file(input : 'pw-pulse.in',
|
||
|
|
output : 'pw-pulse',
|
||
|
|
configuration : tools_config,
|
||
|
|
- install: true,
|
||
|
|
install_dir : pipewire_bindir)
|
||
|
|
|
||
|
|
pipewire_pulseaudio = shared_library('pulse',
|
||
|
|
--
|
||
|
|
2.26.2
|
||
|
|
|