Handle a prefix in prefix/

This is usefull to use external libs and tool not buildable with meson
inside our environment

diff --git a/.gitignore b/.gitignore
index 3dae67b572215cc346cd01e9a12d05514ceca4b6..7120f9a6c27d70b415d53f30ee099c1fce079c1c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ subprojects/gst-rtsp-server/
 subprojects/gstreamer/
 subprojects/gstreamer-vaapi/
 subprojects/glib/
+prefix/

diff --git a/README.md b/README.md
index 11d38d438db03a93fdf95c4dc1326aa056573e42..0a0f9d93fed7f2e3ff76ff370cb273c607a49652 100644 (file)
--- a/README.md
+++ b/README.md
@@ -43,6 +43,9 @@ available at the root of `gst-build/` for example GStreamer core will be in
 `gstreamer/`. Otherwise they will be present in `subprojects/`. You can simply
 hack in there and to rebuild you just need to rerun `ninja -C build/`.
 
+NOTE: In the uninstalled environment, a fully usable prefix is also configured
+in `gst-build/prefix` where you can install any extra dependency/project.
+
 ## Update git subprojects
 
 We added a special `update` target to update subprojects (it uses `git pull

diff --git a/gst-uninstalled.py b/gst-uninstalled.py
index a773801ad72fed530dda1f4a23f035280ae2ead7..7823cf6271db8ac21877e7da593e5b7bdbd177d3 100755 (executable)
--- a/gst-uninstalled.py
+++ b/gst-uninstalled.py
@@ -14,6 +14,7 @@ import tempfile
 from common import get_meson
 
 SCRIPTDIR = os.path.abspath(os.path.dirname(__file__))
+PREFIX_DIR = os.path.join(SCRIPTDIR, 'prefix')
 
 
 def prepend_env_var(env, var, value):
@@ -56,6 +57,14 @@ def get_subprocess_env(options):
 
     prepend_env_var(env, "GST_PLUGIN_PATH", os.path.join(SCRIPTDIR, 'subprojects',
                                                         'gst-python', 'plugin'))
+    prepend_env_var(env, "GST_PLUGIN_PATH", os.path.join(PREFIX_DIR, 'lib',
+                                                        'gstreamer-1.0'))
+    prepend_env_var(env, "PATH", os.path.join(PREFIX_DIR, 'bin'))
+    prepend_env_var(env, lib_path_envvar, os.path.join(PREFIX_DIR, 'lib'))
+    prepend_env_var(env, "GST_VALIDATE_SCENARIOS_PATH", os.path.join(
+        PREFIX_DIR, 'share', 'gstreamer-1.0', 'validate', 'scenarios'))
+    prepend_env_var(env, "GI_TYPELIB_PATH", os.path.join(PREFIX_DIR, 'lib',
+                                                         'lib', 'girepository-1.0'))
 
     meson, mesonconf, mesonintrospect = get_meson()
     targets_s = subprocess.check_output([sys.executable, mesonintrospect, options.builddir, '--targets'])