From 3c1caa331330c81ee30e48df36e6d65803058b25 Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Fri, 07 Sep 2012 11:36:33 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:sugar-build/sugar-build

Conflicts:
	Makefile
	scripts/system.modules
---
diff --git a/Makefile b/Makefile
index 737ce8c..475b90c 100644
--- a/Makefile
+++ b/Makefile
@@ -72,6 +72,9 @@ clean:
 	rm -rf source/gst-plugins-espeak
 	rm -rf source/sugar
 	rm -rf source/sugar-toolkit-gtk3
+	rm -rf source/gst-plugins-bad
+	rm -rf source/gst-plugins-ugly
+	rm -rf source/gst-ffmpeg
 	rm -f logs/*.log logs/all-logs.tar.bz2
 	rm -f scripts/list-outputs
 	rm -f scripts/find-free-display
diff --git a/scripts/check-system b/scripts/check-system
index 07a3cd8..5880d27 100755
--- a/scripts/check-system
+++ b/scripts/check-system
@@ -262,6 +262,10 @@ checks = \
    "checker": "binary",
    "packages": { "fedora": "gcc-c++",
                  "ubuntu": "g++" } },
+ { "check": "yasm",
+   "checker": "binary",
+   "packages": { "fedora": "yasm",
+                 "ubuntu": "yasm" } },
  { "check": "flex",
    "checker": "binary",
    "packages": { "fedora": "flex",
diff --git a/scripts/system.modules b/scripts/system.modules
index 3c645b0..6dd518f 100644
--- a/scripts/system.modules
+++ b/scripts/system.modules
@@ -46,16 +46,16 @@
     <branch repo="git.gnome.org" revision="3e706ef88b3b433f777e552c85339b901314deaa"/>
   </autotools>
   <autotools id="gstreamer" supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" revision="8d9a4b2e94fa806f5146482fb0261d890db38fd5"/>
+    <branch repo="gstreamer.freedesktop.org" revision="a30e63740644179aab267c17d7748333f6d7ae2c"/>
   </autotools>
   <autotools id="gst-plugins-base" supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" revision="39aa4dc674291f438606ccab6033225f7a886de4"/>
+    <branch repo="gstreamer.freedesktop.org" revision="efac71bab7aec1659e759431ae658ceeb2abbafd"/>
     <dependencies>
       <dep package="gstreamer"/>
     </dependencies>
   </autotools>
   <autotools id="gst-plugins-good" supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" revision="86c236a5f61725dc4e0fe22ba6681795bb5f1160"/>
+    <branch repo="gstreamer.freedesktop.org" revision="916e4c86fac864d2230590d99ec5c54b382e6e7b"/>
     <dependencies>
       <dep package="gst-plugins-base"/>
     </dependencies>
@@ -66,6 +66,21 @@
   <autotools id="libxklavier">
     <branch repo="freedesktop.org"/>
   </autotools>
+  <autotools id="gst-plugins-bad" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" revision="c1923a6755ad4a71597817c267a96deed10a3b94"/>
+    <dependencies>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+  </autotools>
+  <autotools id="gst-plugins-ugly" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" revision="ef0efeddf3b70fbc32ce2fc1c4e6dbdccac4ac74"/>
+    <dependencies>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+  </autotools>
+  <autotools id="gst-ffmpeg" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" revision="6d1203e5ab574b70ba421cd2d839b9b958f23bab"/>
+  </autotools>
 
   <metamodule id="meta-system">
     <dependencies>
@@ -74,6 +89,9 @@
       <dep package="gst-plugins-good"/>
       <dep package="gst-plugins-espeak"/>
       <dep package="libxklavier"/>
+      <dep package="gst-plugins-bad"/>
+      <dep package="gst-plugins-ugly"/>
+      <dep package="gst-ffmpeg"/>
     </dependencies>
   </metamodule>
 </moduleset>
--
cgit v0.9.1