Set GST_PLUGIN_PATH only to plugin paths
This commit is contained in:
parent
c071855c48
commit
43c107d4fe
@ -24,9 +24,6 @@ def prepend_env_var(env, var, value):
|
|||||||
def get_subprocess_env(options):
|
def get_subprocess_env(options):
|
||||||
env = os.environ.copy()
|
env = os.environ.copy()
|
||||||
|
|
||||||
prepend_env_var(env, "GST_PLUGIN_PATH", options.builddir)
|
|
||||||
prepend_env_var(env, "GST_PLUGIN_PATH", os.path.join(SCRIPTDIR, 'subprojects',
|
|
||||||
'gst-python', 'plugin'))
|
|
||||||
env["CURRENT_GST"] = os.path.normpath(SCRIPTDIR)
|
env["CURRENT_GST"] = os.path.normpath(SCRIPTDIR)
|
||||||
env["GST_VALIDATE_SCENARIOS_PATH"] = os.path.normpath(
|
env["GST_VALIDATE_SCENARIOS_PATH"] = os.path.normpath(
|
||||||
"%s/subprojects/gst-devtools/validate/data/scenarios" % SCRIPTDIR)
|
"%s/subprojects/gst-devtools/validate/data/scenarios" % SCRIPTDIR)
|
||||||
@ -56,6 +53,9 @@ def get_subprocess_env(options):
|
|||||||
else:
|
else:
|
||||||
lib_path_envvar = 'LD_LIBRARY_PATH'
|
lib_path_envvar = 'LD_LIBRARY_PATH'
|
||||||
|
|
||||||
|
prepend_env_var(env, "GST_PLUGIN_PATH", os.path.join(SCRIPTDIR, 'subprojects',
|
||||||
|
'gst-python', 'plugin'))
|
||||||
|
|
||||||
meson, mesonconf, mesonintrospect = get_meson()
|
meson, mesonconf, mesonintrospect = get_meson()
|
||||||
targets_s = subprocess.check_output([sys.executable, mesonintrospect, options.builddir, '--targets'])
|
targets_s = subprocess.check_output([sys.executable, mesonintrospect, options.builddir, '--targets'])
|
||||||
targets = json.loads(targets_s.decode())
|
targets = json.loads(targets_s.decode())
|
||||||
@ -71,6 +71,7 @@ def get_subprocess_env(options):
|
|||||||
continue
|
continue
|
||||||
|
|
||||||
if os.path.normpath("lib/gstreamer-1.0") in os.path.normpath(target.get('install_filename')):
|
if os.path.normpath("lib/gstreamer-1.0") in os.path.normpath(target.get('install_filename')):
|
||||||
|
prepend_env_var(env, "GST_PLUGIN_PATH", os.path.join(options.builddir, root))
|
||||||
continue
|
continue
|
||||||
|
|
||||||
prepend_env_var(env, lib_path_envvar,
|
prepend_env_var(env, lib_path_envvar,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user