43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
From 2108ed8d025499fbf11dfe750ebc7617bdbb795a Mon Sep 17 00:00:00 2001
|
|
From: Gilles Dartiguelongue <eva@gentoo.org>
|
|
Date: Thu, 7 Jun 2018 23:47:48 +0200
|
|
Subject: [PATCH] Make gst-inspect calls optional at build-time
|
|
|
|
Crashes on Gentoo due to plugins trying to access dri nodes which are sandboxed
|
|
---
|
|
meson_options.txt | 1 +
|
|
src/backend/meson.build | 2 ++
|
|
2 files changed, 3 insertions(+)
|
|
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
|
index d6f8b4290..c8db92335 100644
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -2,3 +2,4 @@ option('enable-easy-codec-installation', type: 'combo', choices: ['yes', 'no', '
|
|
option('enable-python', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable python support')
|
|
option('with-plugins', type: 'combo', choices: ['all', 'none', 'auto'], value: 'auto', description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)')
|
|
option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
|
|
+option('gst-inspect', type: 'boolean', value: true, description: 'build-time test of available gstreamer plugins')
|
|
diff --git a/src/backend/meson.build b/src/backend/meson.build
|
|
index 7a63bab1b..5c4ebb996 100644
|
|
--- a/src/backend/meson.build
|
|
+++ b/src/backend/meson.build
|
|
@@ -1,5 +1,6 @@
|
|
backend_inc = include_directories('.')
|
|
|
|
+if get_option('gst-inspect')
|
|
gst_inspect = find_program(
|
|
'gst-inspect-1.0',
|
|
join_paths(gst_dep.get_pkgconfig_variable('toolsdir'), 'gst-inspect-1.0'),
|
|
@@ -31,6 +32,7 @@ foreach plugin: gst_good_plugins
|
|
assert(r.returncode() == 0,
|
|
'Cannot find required GStreamer-1.0 plugin "' + plugin + '". It should be part of gst-plugins-good. Please install it.')
|
|
endforeach
|
|
+endif
|
|
|
|
sources = files(
|
|
'bacon-time-label.c',
|
|
--
|
|
2.20.1
|
|
|