mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 11:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

Meson: Use generated -uninstalled.pc files

Browse source
This commit is contained in:
Xavier Claessens 2020-03-30 15:31:13 -04:00
parent a4f711e9e5
commit 8046eda879
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst-env.py
View file

@ -359,7 +359,6 @@ def get_subprocess_env(options, gst_version):
presets = set() presets = set()
encoding_targets = set() encoding_targets = set()
pkg_dirs = set()
python_dirs = setup_gdb(options) python_dirs = setup_gdb(options)
if '--installed' in subprocess.check_output(meson + ['introspect', '-h']).decode(): if '--installed' in subprocess.check_output(meson + ['introspect', '-h']).decode():
installed_s = subprocess.check_output(meson + ['introspect', options.builddir, '--installed']) installed_s = subprocess.check_output(meson + ['introspect', options.builddir, '--installed'])
@ -388,11 +387,6 @@ def get_subprocess_env(options, gst_version):
elif path.endswith('.gep'): elif path.endswith('.gep'):
encoding_targets.add( encoding_targets.add(
os.path.abspath(os.path.join(os.path.dirname(path), '..'))) os.path.abspath(os.path.join(os.path.dirname(path), '..')))
elif path.endswith('.pc'):
# Is there a -uninstalled pc file for this file?
uninstalled = "{0}-uninstalled.pc".format(path[:-3])
if os.path.exists(uninstalled):
pkg_dirs.add(os.path.dirname(path))
if path.endswith('gstomx.conf'): if path.endswith('gstomx.conf'):
prepend_env_var(env, 'GST_OMX_CONFIG_DIR', os.path.dirname(path), prepend_env_var(env, 'GST_OMX_CONFIG_DIR', os.path.dirname(path),
@ -404,9 +398,6 @@ def get_subprocess_env(options, gst_version):
for t in sorted(encoding_targets): for t in sorted(encoding_targets):
prepend_env_var(env, 'GST_ENCODING_TARGET_PATH', t, options.sysroot) prepend_env_var(env, 'GST_ENCODING_TARGET_PATH', t, options.sysroot)
for pkg_dir in sorted(pkg_dirs):
prepend_env_var(env, "PKG_CONFIG_PATH", pkg_dir, options.sysroot)
# Check if meson has generated -uninstalled pkgconfig files # Check if meson has generated -uninstalled pkgconfig files
meson_uninstalled = pathlib.Path(options.builddir) / 'meson-uninstalled' meson_uninstalled = pathlib.Path(options.builddir) / 'meson-uninstalled'
if meson_uninstalled.is_dir(): if meson_uninstalled.is_dir():