[gnome-ostree] 3.6: Switch to stable libffi, update manifest for other 3.6 adjustments

[Colin Walters <walters src gnome org>]

commit 09e971056b1e0234c42c28c19eca9ffa4fb5faeb
Author: Colin Walters <walters verbum org>
Date:   Wed May 9 13:49:10 2012 -0400

    3.6: Switch to stable libffi, update manifest for other 3.6 adjustments

 gnomeos-3.6.json |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/gnomeos-3.6.json b/gnomeos-3.6.json
index d0689ca..1a4f9ee 100644
--- a/gnomeos-3.6.json
+++ b/gnomeos-3.6.json
@@ -37,7 +37,8 @@
 		 "component": "devel",
 		 "noarch": true},
 
-		{"src": "git:git://github.com/atgreen/libffi.git"},
+		{"src": "git:git://github.com/atgreen/libffi.git",
+		 "branch": "v3.0.10"},
 
 		{"src": "gnome:glib"},
 
@@ -494,7 +495,8 @@
 		{"src": "gnome:librsvg",
 		 "config-opts": ["--disable-gtk-theme"]},
 
-		{"src": "gnome:cogl"},
+		{"src": "gnome:cogl",
+		 "branch": "cogl-1.10"},
 
 		{"src": "gnome:clutter"},
 
@@ -556,7 +558,8 @@
 
 		{"src": "gnome:gnome-icon-theme-extras"},
 
-		{"src": "gnome:gvfs"},
+		{"src": "gnome:gvfs",
+		 "config-opts": ["--disable-gphoto2"]},
 
 		{"src": "gnome:gnome-screensaver"},
 
@@ -701,6 +704,8 @@
 
 		{"src": "gnome:clutter-gst"},
 
+		{"src": "gnome:clutter-gtk"},
+
 		{"src": "gnome:gnome-control-center",
 		 "config-opts": ["--disable-cups"]},