From 991b59c4450f063f783cda0088440e5e037deffb Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Wed, 21 Nov 2012 20:46:34 +0000
Subject: Differentiate gst plugins version

---
diff --git a/config/deps/sugar-runtime-3.4.json b/config/deps/sugar-runtime-3.4.json
index 79f0d25..3a391d0 100644
--- a/config/deps/sugar-runtime-3.4.json
+++ b/config/deps/sugar-runtime-3.4.json
@@ -78,7 +78,7 @@
    "check": "from gi.repository import Vte",
    "checker": "python" },
  { "check": "video4linux2",
-   "checker": "gstreamer" },
+   "checker": "gstreamer-0.10" },
  { "check_name": "abiword python",
    "check": "import abiword",
    "checker": "python" },
diff --git a/config/deps/sugar-runtime-3.6.json b/config/deps/sugar-runtime-3.6.json
index aeeea2d..1331fa8 100644
--- a/config/deps/sugar-runtime-3.6.json
+++ b/config/deps/sugar-runtime-3.6.json
@@ -78,10 +78,10 @@
    "check": "from gi.repository import Vte",
    "checker": "python" },
  { "check": "video4linux2",
-   "checker": "gstreamer" },
+   "checker": "gstreamer-0.10" },
  { "check_name": "playback gstreamer",
    "check": "playback",
-   "checker": "gstreamer" },
+   "checker": "gstreamer-1.0" },
  { "check_name": "abiword python",
    "check": "import abiword",
    "checker": "python" },
diff --git a/devbot/system.py b/devbot/system.py
index 9a59b0c..8e493cf 100644
--- a/devbot/system.py
+++ b/devbot/system.py
@@ -46,21 +46,29 @@ def check_dbus(check):
 def check_metacity_theme(check):
     return not os.path.exists("/usr/share/themes/%s/metacity-1/metacity-theme-3.xml" % check)
 
-def check_gstreamer(check):
+def check_gstreamer(check, version):
     missing = True
     
     for libdir in libdirs:
-        if os.path.exists("/usr/%s/gstreamer-0.10/libgst%s.so" % (libdir, check)):
+        if os.path.exists("/usr/%s/gstreamer-%s/libgst%s.so" % \
+                          (libdir, version, check)):
             missing = False
 
     return missing
 
+def check_gstreamer_0_10(check):
+    return check_gstreamer(check, "0.10")
+
+def check_gstreamer_1_0(check):
+    return check_gstreamer(check, "1.0")
+
 checkers = { "binary": check_binary,
              "python": check_python,
              "pkgconfig": check_pkgconfig,
              "gtkmodule": check_gtkmodule,
              "dbus": check_dbus,
-             "gstreamer": check_gstreamer,
+             "gstreamer-0.10": check_gstreamer_0_10,
+             "gstreamer-1.0": check_gstreamer_1_0,
              "metacity-theme": check_metacity_theme,
              "include": check_include }
 
--
cgit v0.9.1