[jhbuild] Fix handling of parallel installable GStreamers

[Bastien Nocera <hadess src gnome org>]

commit d730be6051cad6c15fd0a363fc20fa6980ff2c64
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Jul 5 15:35:45 2012 +0100

    Fix handling of parallel installable GStreamers
    
    If GStreamer 1.0 and 0.10 were used in the same prefix, they
    would end up with mixed plugin paths, and the same registry, even
    though the 2 systems are not compatible.
    
    Fix this by using GStreamer-1.0 specific envvars.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=679407

 jhbuild/config.py |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/jhbuild/config.py b/jhbuild/config.py
index bc402dd..9b6167f 100644
--- a/jhbuild/config.py
+++ b/jhbuild/config.py
@@ -454,15 +454,23 @@ class Config:
         addpath('XCURSOR_PATH', xcursordir)
 
         # GST_PLUGIN_PATH
-        for gst in ('gstreamer-1.0', 'gstreamer-0.10'):
-            gstplugindir = os.path.join(self.libdir , gst)
-            if os.path.exists(gstplugindir):
-                addpath('GST_PLUGIN_PATH', gstplugindir)
+        gstplugindir = os.path.join(self.libdir , 'gstreamer-0.10')
+        if os.path.exists(gstplugindir):
+            addpath('GST_PLUGIN_PATH', gstplugindir)
+
+        # GST_PLUGIN_PATH_1_0
+        gstplugindir = os.path.join(self.libdir , 'gstreamer-1.0')
+        if os.path.exists(gstplugindir):
+            addpath('GST_PLUGIN_PATH_1_0', gstplugindir)
 
         # GST_REGISTRY
-        gstregistry = os.path.join(self.prefix, '_jhbuild', 'gstreamer.registry')
+        gstregistry = os.path.join(self.prefix, '_jhbuild', 'gstreamer-0.10.registry')
         addpath('GST_REGISTRY', gstregistry)
 
+        # GST_REGISTRY_1_0
+        gstregistry = os.path.join(self.prefix, '_jhbuild', 'gstreamer-1.0.registry')
+        addpath('GST_REGISTRY_1_0', gstregistry)
+
         # ACLOCAL_PATH
         aclocalpath = os.path.join(self.prefix, 'share', 'aclocal')
         addpath('ACLOCAL_PATH', aclocalpath)