mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

Add versioned variants of some environment variables

Browse source 
Improve parallel installability in setups like jhbuild by
providing versioned variants of some environment variables:

 GST_REGISTRY_1_0
 GST_PLUGIN_PATH_1_0
 GST_PLUGIN_SYSTEM_PATH_1_0
 GST_PLUGIN_SCANNER_1_0

will now be checked before checking the unversioned ones.

https://bugzilla.gnome.org/show_bug.cgi?id=679407
This commit is contained in:
Tim-Philipp Müller 2012-07-04 18:16:23 +01:00
parent 7b5cd72920
commit bcec051a5f
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/gstpluginloader.c
View file

@ -457,7 +457,9 @@ gst_plugin_loader_spawn (GstPluginLoader * loader)
/* Find the gst-plugin-scanner: first try the env-var if it is set, /* Find the gst-plugin-scanner: first try the env-var if it is set,
* otherwise use the installed version */ * otherwise use the installed version */
env = g_getenv ("GST_PLUGIN_SCANNER"); env = g_getenv ("GST_PLUGIN_SCANNER_1_0");
if (env == NULL)
env = g_getenv ("GST_PLUGIN_SCANNER");
if (env != NULL && *env != '\0') { if (env != NULL && *env != '\0') {
GST_LOG ("Trying GST_PLUGIN_SCANNER env var: %s", env); GST_LOG ("Trying GST_PLUGIN_SCANNER env var: %s", env);

16
gst/gstregistry.c
View file

@ -1121,7 +1121,8 @@ gst_registry_scan_plugin_file (GstRegistryScanContext * context,
filename, file_size, file_mtime)) { filename, file_size, file_mtime)) {
g_warning ("External plugin loader failed. This most likely means that " g_warning ("External plugin loader failed. This most likely means that "
"the plugin loader helper binary was not found or could not be run. " "the plugin loader helper binary was not found or could not be run. "
"%s", (g_getenv ("GST_PLUGIN_PATH") != NULL) ? "%s",
(g_getenv ("GST_PLUGIN_PATH") || g_getenv ("GST_PLUGIN_PATH_1_0")) ?
"If you are running an uninstalled GStreamer setup, you might need " "If you are running an uninstalled GStreamer setup, you might need "
"to update your gst-uninstalled script so that the " "to update your gst-uninstalled script so that the "
"GST_PLUGIN_SCANNER environment variable gets set." : ""); "GST_PLUGIN_SCANNER environment variable gets set." : "");
@ -1553,7 +1554,9 @@ scan_and_update_registry (GstRegistry * default_registry,
/* GST_PLUGIN_PATH specifies a list of directories to scan for /* GST_PLUGIN_PATH specifies a list of directories to scan for
* additional plugins. These take precedence over the system plugins */ * additional plugins. These take precedence over the system plugins */
plugin_path = g_getenv ("GST_PLUGIN_PATH"); plugin_path = g_getenv ("GST_PLUGIN_PATH_1_0");
if (plugin_path == NULL)
plugin_path = g_getenv ("GST_PLUGIN_PATH");
if (plugin_path) { if (plugin_path) {
char **list; char **list;
int i; int i;
@ -1571,7 +1574,9 @@ scan_and_update_registry (GstRegistry * default_registry,
/* GST_PLUGIN_SYSTEM_PATH specifies a list of plugins that are always /* GST_PLUGIN_SYSTEM_PATH specifies a list of plugins that are always
* loaded by default. If not set, this defaults to the system-installed * loaded by default. If not set, this defaults to the system-installed
* path, and the plugins installed in the user's home directory */ * path, and the plugins installed in the user's home directory */
plugin_path = g_getenv ("GST_PLUGIN_SYSTEM_PATH"); plugin_path = g_getenv ("GST_PLUGIN_SYSTEM_PATH_1_0");
if (plugin_path == NULL)
plugin_path = g_getenv ("GST_PLUGIN_SYSTEM_PATH");
if (plugin_path == NULL) { if (plugin_path == NULL) {
char *home_plugins; char *home_plugins;
@ -1661,7 +1666,10 @@ ensure_current_registry (GError ** error)
gboolean have_cache = TRUE; gboolean have_cache = TRUE;
default_registry = gst_registry_get (); default_registry = gst_registry_get ();
registry_file = g_strdup (g_getenv ("GST_REGISTRY"));
registry_file = g_strdup (g_getenv ("GST_REGISTRY_1_0"));
if (registry_file == NULL)
registry_file = g_strdup (g_getenv ("GST_REGISTRY"));
if (registry_file == NULL) { if (registry_file == NULL) {
registry_file = g_build_filename (g_get_user_cache_dir (), registry_file = g_build_filename (g_get_user_cache_dir (),
"gstreamer-" GST_API_VERSION, "registry." TARGET_CPU ".bin", NULL); "gstreamer-" GST_API_VERSION, "registry." TARGET_CPU ".bin", NULL);