|
 |
2e5435 |
From 5fb074785ec5ee8f7a9f162766dd4462ebf0a149 Mon Sep 17 00:00:00 2001
|
|
|
2e5435 |
From: Wim Taymans <wtaymans@redhat.com>
|
|
|
2e5435 |
Date: Fri, 30 Nov 2018 16:58:47 +0100
|
|
|
2e5435 |
Subject: [PATCH 2/2] Revert "meson: Use feature for GStreamer and make it
|
|
|
2e5435 |
auto"
|
|
|
2e5435 |
|
|
|
2e5435 |
This reverts commit 795b352cbaf68ce6f05ab9e9d46d4eff39ffee14.
|
|
|
2e5435 |
---
|
|
|
2e5435 |
meson.build | 31 +++++++++++--------------------
|
|
|
2e5435 |
meson_options.txt | 4 ++--
|
|
|
2e5435 |
src/daemon/meson.build | 3 ++-
|
|
|
2e5435 |
src/meson.build | 2 +-
|
|
|
2e5435 |
4 files changed, 16 insertions(+), 24 deletions(-)
|
|
|
2e5435 |
|
|
|
2e5435 |
diff --git a/meson.build b/meson.build
|
|
|
2e5435 |
index 3c3b6dfb..d54f0d42 100644
|
|
|
2e5435 |
--- a/meson.build
|
|
|
2e5435 |
+++ b/meson.build
|
|
|
2e5435 |
@@ -1,6 +1,6 @@
|
|
|
2e5435 |
project('pipewire', 'c',
|
|
|
2e5435 |
version : '0.2.5',
|
|
|
2e5435 |
- meson_version : '>= 0.47.0',
|
|
|
2e5435 |
+ meson_version : '>= 0.45.0',
|
|
|
2e5435 |
default_options : [ 'warning_level=1',
|
|
|
2e5435 |
'c_std=gnu99',
|
|
|
2e5435 |
'buildtype=debugoptimized' ])
|
|
|
2e5435 |
@@ -161,25 +161,16 @@ dl_lib = cc.find_library('dl', required : false)
|
|
|
2e5435 |
pthread_lib = dependency('threads')
|
|
|
2e5435 |
dbus_dep = dependency('dbus-1')
|
|
|
2e5435 |
|
|
|
2e5435 |
-if not get_option('gstreamer').disabled()
|
|
|
2e5435 |
- build_gst = true
|
|
|
2e5435 |
- glib_dep = [dependency('glib-2.0', version : '>=2.32.0', required: get_option('gstreamer'))]
|
|
|
2e5435 |
- gobject_dep = [dependency('gobject-2.0', required: get_option('gstreamer'))]
|
|
|
2e5435 |
- gmodule_dep = [dependency('gmodule-2.0', required: get_option('gstreamer'))]
|
|
|
2e5435 |
- gio_dep = [dependency('gio-2.0', required: get_option('gstreamer')), dependency('gio-unix-2.0', required: get_option('gstreamer'))]
|
|
|
2e5435 |
- gst_dep = [dependency('gstreamer-1.0', required: get_option('gstreamer')),
|
|
|
2e5435 |
- dependency('gstreamer-plugins-base-1.0', required: get_option('gstreamer')),
|
|
|
2e5435 |
- dependency('gstreamer-video-1.0', required: get_option('gstreamer')),
|
|
|
2e5435 |
- dependency('gstreamer-audio-1.0', required: get_option('gstreamer')),
|
|
|
2e5435 |
- dependency('gstreamer-allocators-1.0', required: get_option('gstreamer')),]
|
|
|
2e5435 |
- foreach dep: glib_dep + gobject_dep + gio_dep + gst_dep
|
|
|
2e5435 |
- if build_gst and not dep.found()
|
|
|
2e5435 |
- build_gst = false
|
|
|
2e5435 |
- message('@0@ not found, disabling GStreamer'.format(dep))
|
|
|
2e5435 |
- endif
|
|
|
2e5435 |
- endforeach
|
|
|
2e5435 |
-else
|
|
|
2e5435 |
- build_gst = false
|
|
|
2e5435 |
+if get_option('gstreamer')
|
|
|
2e5435 |
+ glib_dep = dependency('glib-2.0', version : '>=2.32.0')
|
|
|
2e5435 |
+ gobject_dep = dependency('gobject-2.0')
|
|
|
2e5435 |
+ gmodule_dep = dependency('gmodule-2.0')
|
|
|
2e5435 |
+ gio_dep = [dependency('gio-2.0'), dependency('gio-unix-2.0')]
|
|
|
2e5435 |
+ gst_dep = [dependency('gstreamer-1.0'),
|
|
|
2e5435 |
+ dependency('gstreamer-plugins-base-1.0'),
|
|
|
2e5435 |
+ dependency('gstreamer-video-1.0'),
|
|
|
2e5435 |
+ dependency('gstreamer-audio-1.0'),
|
|
|
2e5435 |
+ dependency('gstreamer-allocators-1.0'),]
|
|
|
2e5435 |
endif
|
|
|
2e5435 |
|
|
|
2e5435 |
subdir('spa')
|
|
|
2e5435 |
diff --git a/meson_options.txt b/meson_options.txt
|
|
|
2e5435 |
index 5ea74ff0..3d21b2b4 100644
|
|
|
2e5435 |
--- a/meson_options.txt
|
|
|
2e5435 |
+++ b/meson_options.txt
|
|
|
2e5435 |
@@ -8,8 +8,8 @@ option('man',
|
|
|
2e5435 |
value: false)
|
|
|
2e5435 |
option('gstreamer',
|
|
|
2e5435 |
description: 'Build GStreamer plugins',
|
|
|
2e5435 |
- type: 'feature',
|
|
|
2e5435 |
- value: 'auto')
|
|
|
2e5435 |
+ type: 'boolean',
|
|
|
2e5435 |
+ value: false)
|
|
|
2e5435 |
option('systemd',
|
|
|
2e5435 |
description: 'Enable systemd integration',
|
|
|
2e5435 |
type: 'boolean',
|
|
|
2e5435 |
diff --git a/src/daemon/meson.build b/src/daemon/meson.build
|
|
|
2e5435 |
index f2a327fb..4a7d9536 100644
|
|
|
2e5435 |
--- a/src/daemon/meson.build
|
|
|
2e5435 |
+++ b/src/daemon/meson.build
|
|
|
2e5435 |
@@ -13,11 +13,12 @@ pipewire_c_args = [
|
|
|
2e5435 |
'-DG_LOG_DOMAIN=g_log_domain_pipewire',
|
|
|
2e5435 |
]
|
|
|
2e5435 |
|
|
|
2e5435 |
+conf_config = configuration_data()
|
|
|
2e5435 |
conf_install_dir = join_paths(get_option('sysconfdir'), 'pipewire')
|
|
|
2e5435 |
|
|
|
2e5435 |
configure_file(input : 'pipewire.conf.in',
|
|
|
2e5435 |
output : 'pipewire.conf',
|
|
|
2e5435 |
- copy : true,
|
|
|
2e5435 |
+ configuration : conf_config,
|
|
|
2e5435 |
install_dir : conf_install_dir)
|
|
|
2e5435 |
|
|
|
2e5435 |
|
|
|
2e5435 |
diff --git a/src/meson.build b/src/meson.build
|
|
|
2e5435 |
index 723e2c69..0ad7778d 100644
|
|
|
2e5435 |
--- a/src/meson.build
|
|
|
2e5435 |
+++ b/src/meson.build
|
|
|
2e5435 |
@@ -6,6 +6,6 @@ subdir('tools')
|
|
|
2e5435 |
subdir('modules')
|
|
|
2e5435 |
subdir('examples')
|
|
|
2e5435 |
|
|
|
2e5435 |
-if build_gst
|
|
|
2e5435 |
+if get_option('gstreamer')
|
|
|
2e5435 |
subdir('gst')
|
|
|
2e5435 |
endif
|
|
|
2e5435 |
--
|
|
|
2e5435 |
2.19.2
|
|
|
2e5435 |
|