Merge branch 'master' into msvc-support-master

[profile/ivi/clutter.git] / build / clutter.modules

diff --git a/build/clutter.modules b/build/clutter.modules
index 43f9bf6..471e152 100644 (file)
--- a/build/clutter.modules
+++ b/build/clutter.modules
@@ -4,7 +4,7 @@
 <!-- vim:set ts=2 expandtab: -->
 <moduleset>
   <repository type="git" name="git.freedesktop.org"
-      href="git://anongit.freedesktop.org/git/"/>
+      href="git://anongit.freedesktop.org/"/>
   <repository type="git" name="git.gnome.org"
       href="git://git.gnome.org/"/>
   <repository type="git" name="git.clutter-project.org"
@@ -13,6 +13,10 @@
       href="git://git.moblin.org/"/>
   <repository type="git" name="github.com/rib"
       href="git://github.com/rib/"/>
+  <repository type="git" name="github.com/clutter-project"
+      href="git://github.com/clutter-project/"/>
+  <repository type="git" name="gstreamer.freedesktop.org"
+      href="git://anongit.freedesktop.org/gstreamer/"/>
 
   <!-- tarballs -->
   <repository type="tarball" name="cairo.org"
@@ -34,18 +38,18 @@
   </tarball>
 
   <autotools id="pixman" autogenargs="--disable-gtk">
-    <branch module="releases/pixman-0.18.2.tar.gz" version="0.18.2"
+    <branch module="releases/pixman-0.18.4.tar.gz" version="1.18.4"
             repo="cairo.org"
-            hash="sha256:80aee833b429d105d2c7593ef96993da04441b3b747084f1f3bfd7be594e1c45"
-            md5sum="5d1378fa61610dd5d3c7e0111b2c5253" size="510704">
+            hash="sha256:1484092277c5187f5458229a2b7fd7fbc0cb07e1f220c7f8f9ac65de6dba7989"
+            md5sum="532db4194e18c108d0b7dd85f20d39b8" size="510878">
     </branch>
   </autotools>
 
   <autotools id="cairo" autogenargs="--enable-xlib">
-    <branch module="snapshots/cairo-1.9.12.tar.gz" version="1.9.12"
+    <branch module="releases/cairo-1.10.0.tar.gz" version="1.10.0"
             repo="cairo.org"
-            hash="sha256:61879cb8d5e0f785251bd663b825a52754017f53eef3a25fbbf7799d19b765ba"
-            md5sum="0a264bb080af8346f7ae25581f59f661" size="23402463">
+            hash="sha256:0f2ce4cc4615594088d74eb8b5360bad7c3cc3c3da9b61af9bfd979ed1ed94b2"
+            md5sum="70a2ece66cf473d976e2db0f75bf199e" size="24022822">
     </branch>
     <dependencies>
       <dep package="fontconfig"/>
@@ -73,6 +77,12 @@
     </after>
   </tarball>
 
+  <tarball id="liboil" version="0.3.17">
+    <source href="http://liboil.freedesktop.org/download/liboil-0.3.17.tar.gz"
+            hash="sha256:105f02079b0b50034c759db34b473ecb5704ffa20a5486b60a8b7698128bfc69"
+            md5sum="47dc734f82faeb2964d97771cfd2e701" size="912563"/>
+  </tarball>
+
 <!--
   <autotools id="libXft" supports-non-srcdir-builds="no">
     <branch repo="git.freedesktop.org"
@@ -83,6 +93,23 @@
   </autotools>
 -->
 
+  <autotools id="mesa">
+    <branch repo="git.freedesktop.org"
+            supports-non-srcdir-builds="no"
+            check-target="false"
+            skip-autogen="never"
+            module="mesa/mesa"
+            checkoutdir="mesa"/>
+  </autotools>
+
+  <autotools id="wayland">
+    <branch repo="git.freedesktop.org"
+            module="wayland" checkoutdir="wayland"/>
+    <dependencies>
+      <dep package="mesa"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gtk-doc">
     <branch repo="git.gnome.org"
             module="gtk-doc"
@@ -166,7 +193,8 @@
   <autotools id="gtk2">
     <branch repo="git.gnome.org"
             module="gtk+"
-            revision="gtk-2-22"/>
+            checkoutdir="gtk2"
+            revision="gtk-2-24"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gdk-pixbuf"/>
@@ -188,38 +216,70 @@
   <autotools id="json-glib">
     <branch repo="git.gnome.org"
             module="json-glib"
+            revision="json-glib-0-12"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="cogl">
+    <branch repo="git.gnome.org"
+            module="cogl"
             revision="master"/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="cairo"/>
+      <dep package="pango"/>
+      <dep package="gdk-pixbuf"/>
       <dep package="gobject-introspection"/>
     </dependencies>
   </autotools>
 
   <autotools id="clutter">
-    <branch repo="git.clutter-project.org"
+    <branch repo="git.gnome.org"
             module="clutter"
             revision="master"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
       <dep package="pango"/>
-      <dep package="gdk-pixbuf"/>
+      <dep package="cogl"/>
+      <dep package="atk"/>
       <dep package="gobject-introspection"/>
       <dep package="json-glib"/>
     </dependencies>
   </autotools>
 
+  <autotools id="gstreamer" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" module="gstreamer"/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-plugins-base" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-base"/>
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="gtk2"/>
+      <dep package="liboil"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="clutter-gst">
-    <branch repo="git.clutter-project.org"
+    <branch repo="git.gnome.org"
             module="clutter-gst"
             revision="master"/>
     <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
       <dep package="clutter"/>
     </dependencies>
   </autotools>
 
   <autotools id="clutter-gtk">
-    <branch repo="git.clutter-project.org"
+    <branch repo="git.gnome.org"
             module="clutter-gtk"
             revision="master"/>
     <dependencies>
@@ -229,7 +289,7 @@
   </autotools>
 
   <autotools id="clutter-box2d">
-    <branch repo="git.clutter-project.org"
+    <branch repo="github.com/clutter-project"
             module="clutter-box2d"
             revision="master"/>
     <dependencies>
@@ -237,8 +297,17 @@
     </dependencies>
   </autotools>
 
+  <autotools id="clutter-bullet">
+    <branch repo="github.com/clutter-project"
+            module="clutter-bullet"
+            revision="master"/>
+    <dependencies>
+      <dep package="clutter"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="mx" autogenargs="--without-clutter-imcontext --without-clutter-gesture">
-    <branch repo="git.clutter-project.org"
+    <branch repo="github.com/clutter-project"
             module="mx"
             revision="master"/>
     <dependencies>
@@ -247,6 +316,7 @@
     </dependencies>
   </autotools>
 
+<!--
   <autotools id="cally">
     <branch repo="git.clutter-project.org"
             module="cally"
@@ -256,6 +326,7 @@
       <dep package="clutter"/>
     </dependencies>
   </autotools>
+-->
 
   <autotools id="cluttersmith">
     <branch repo="git.clutter-project.org"
@@ -301,8 +372,8 @@
   </autotools>
 
   <autotools id="pyclutter">
-    <branch repo="git.clutter-project.org"
-            module="bindings/pyclutter"
+    <branch repo="git.gnome.org"
+            module="pyclutter"
             revision="master"/>
     <dependencies>
       <dep package="pygobject"/>